OSDN Git Service

am f526c169: (-s ours) am c3dcb6c0: Merge "Consolidate the nanopb-c and regular proto...
authorYing Wang <wangying@android.com>
Tue, 18 Aug 2015 21:51:39 +0000 (21:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 21:51:39 +0000 (21:51 +0000)
commitac9b5af50f84ad83bfa057e42db9c821b76211e5
treed3dfb8cdb4751e1249946ba8958435a4dd242e82
parent20c68b749475bc5d8f5784105036a8cd7cedfce0
parentf526c169efd3da99e2fa01d76e4efec0f2f4f36a
am f526c169: (-s ours) am c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."

* commit 'f526c169efd3da99e2fa01d76e4efec0f2f4f36a':
  Consolidate the nanopb-c and regular protobuf build rules.