tree f9946fe9525d4d1d79cd6ef5152973ced9b735b4
parent 67d1b706886bf6bd56ac3b5d9588d9839bea12c2
parent 9047958967c6c4a425740c37418385200a0caa0a
author Ying Wang <wangying@google.com> 1440652347 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652347 +0000

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

* commit '9047958967c6c4a425740c37418385200a0caa0a':