tree 2cc9ad51449924c4ea665b0eb514e64da5193d92
parent 574aad7c4164c6e44deb4a3f93974120fc8b6595
parent 7cad9030bffed01414bba3780d2389796d270276
author Ying Wang <wangying@google.com> 1440686593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440686593 +0000

am 7cad9030: am 90479589: (-s ours) am b134d578: Rename libnanopb-c to follow other protobuf libraries.

* commit '7cad9030bffed01414bba3780d2389796d270276':