| commit | a9abc487a8fdf3a82932df3f70efd9aab7fb9d35 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Nov 11 19:58:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 19:58:42 2014 +0000 |
| tree | 388f4ddeb27cc68bc125a1f080221bf9c0b9fa70 | |
| parent | 20228b6e4a499105816d7386c9da2820d6200ccf [diff] | |
| parent | 1f6371583ef6ce3a384262ebb291515f5ca3a7b6 [diff] |
am 1f637158: Merge "Use platform protobuf unless building with NDK." * commit '1f6371583ef6ce3a384262ebb291515f5ca3a7b6': Use platform protobuf unless building with NDK.