OSDN Git Service

am 1f637158: Merge "Use platform protobuf unless building with NDK."
authorDan Albert <danalbert@google.com>
Tue, 11 Nov 2014 19:58:42 +0000 (19:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Nov 2014 19:58:42 +0000 (19:58 +0000)
commita9abc487a8fdf3a82932df3f70efd9aab7fb9d35
tree388f4ddeb27cc68bc125a1f080221bf9c0b9fa70
parent20228b6e4a499105816d7386c9da2820d6200ccf
parent1f6371583ef6ce3a384262ebb291515f5ca3a7b6
am 1f637158: Merge "Use platform protobuf unless building with NDK."

* commit '1f6371583ef6ce3a384262ebb291515f5ca3a7b6':
  Use platform protobuf unless building with NDK.
core/binary.mk