tree c7ff7828d5e23794bb83c8be0e82c1129ccf33df
parent 24922acf6df3b2eae127fa2984fb8369fa7429d7
parent 123d99f0adc85e42fa5c34058719bf362aa20239
author Jeff Davidson <jpd@google.com> 1422905459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422905459 +0000

am 123d99f0: Update protobuf library from 2.3 to 2.6.

* commit '123d99f0adc85e42fa5c34058719bf362aa20239':
  Update protobuf library from 2.3 to 2.6.