OSDN Git Service

am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
authorJeff Davidson <jpd@google.com>
Thu, 15 Jan 2015 23:02:01 +0000 (23:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jan 2015 23:02:01 +0000 (23:02 +0000)
commitb9b86f644f47e6e3bdedc5b2419e9d4af1c8b455
tree8f2ca204b2d2bc842b7fc89610988c619b5253df
parent8d129cbf5a8affebaf0883450d637132e2f9f512
parent4df903dbc71c48e2db6fae9390795b81782470b4
am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""

* commit '4df903dbc71c48e2db6fae9390795b81782470b4':
  Revert "Revert "Update protobuf library from 2.3 to 2.6.""