tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 00835d4e7e7f57aafd904e09dd6421b64032daa3
parent 19a443e4e8bf3d37e544eda2c407604616cdae9d
author Jeff Davidson <jpd@google.com> 1421092318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421092318 +0000

am 19a443e4: Merge "Update protobuf library from 2.3 to 2.6."

* commit '19a443e4e8bf3d37e544eda2c407604616cdae9d':
  Update protobuf library from 2.3 to 2.6.