diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 20:05:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 20:05:56 +0000 |
| commit | 655f7c9a82374adfbf9419902a9627f90dc5e651 (patch) | |
| tree | 2a04a2ff31a97a61e1c02c37a16f809588163395 /core/java.mk | |
| parent | d59a919e01a06f6d3769a831f52050f2b5627d27 (diff) | |
| parent | a9abc487a8fdf3a82932df3f70efd9aab7fb9d35 (diff) | |
| download | build-655f7c9a82374adfbf9419902a9627f90dc5e651.zip build-655f7c9a82374adfbf9419902a9627f90dc5e651.tar.gz build-655f7c9a82374adfbf9419902a9627f90dc5e651.tar.bz2 | |
am a9abc487: am 1f637158: Merge "Use platform protobuf unless building with NDK."
* commit 'a9abc487a8fdf3a82932df3f70efd9aab7fb9d35':
Use platform protobuf unless building with NDK.
Diffstat (limited to 'core/java.mk')
0 files changed, 0 insertions, 0 deletions