OSDN Git Service

am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
authorJeff Davidson <jpd@google.com>
Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jan 2015 23:01:59 +0000 (23:01 +0000)
commit0c949bd86773c5d39df11cd824c9df372dc00342
tree85de86e4c3384ae320d0f69ed9806d5dd6122f03
parentd57b7c640dbc25fa1265543ca680a222003cf324
parent64606bd5b0b702b7f6d7fd1088486b5380ccc25f
am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."

* commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
  Update protobuf library from 2.3 to 2.6.
core/binary.mk
core/java.mk