commit | 0c949bd86773c5d39df11cd824c9df372dc00342 | [log] [tgz] |
---|---|---|
author | Jeff Davidson <jpd@google.com> | Thu Jan 15 23:01:59 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 15 23:01:59 2015 +0000 |
tree | 85de86e4c3384ae320d0f69ed9806d5dd6122f03 | |
parent | d57b7c640dbc25fa1265543ca680a222003cf324 [diff] | |
parent | 64606bd5b0b702b7f6d7fd1088486b5380ccc25f [diff] |
am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6." * commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f': Update protobuf library from 2.3 to 2.6.