| commit | fdfd99cd62a9dda9c5d01e039ddbd592ed464947 | [log] [tgz] |
|---|---|---|
| author | Brian Duff <bduff@google.com> | Sat Jun 13 02:25:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 13 02:25:47 2015 +0000 |
| tree | fb5750d8bba9164fb77e428d82b6eb0a02dd3ac1 | |
| parent | 9a8119a74a59bb659feb0afc569780ed5e7abe85 [diff] | |
| parent | ed25bd33e0a3c82983d1fbd9f563f2ecc23e04ff [diff] |
am ed25bd33: Merge "Update the prebuilt Protocol Buffer compilers to include If3184845a0458d16f625036e81507ef9cfdd9217 which makes protoc aware of the new FileOption, javanano_use_deprecated_package." * commit 'ed25bd33e0a3c82983d1fbd9f563f2ecc23e04ff': Update the prebuilt Protocol Buffer compilers to include If3184845a0458d16f625036e81507ef9cfdd9217 which makes protoc aware of the new FileOption, javanano_use_deprecated_package.