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.
This commit is contained in:
Ying Wang 2015-08-18 21:51:44 +00:00 committed by Android Git Automerger
commit e2bf84415c

Diff content is not available