tree 85e0bebb511952d6058e00ef87e2cf4a649d22c8
parent 1511660df29e7a3deed5d30afa2a21e94a97001b
parent c0bdb5415e78dfb6a07257fd7538960d6bef7cca
author Dan Albert <danalbert@google.com> 1441823465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441823465 +0000

am c0bdb541: am ecc40a3a: Merge "Fix name for NDK protobuf libraries."

* commit 'c0bdb5415e78dfb6a07257fd7538960d6bef7cca':
  Fix name for NDK protobuf libraries.