OSDN Git Service

am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""
authorJeff Davidson <jpd@google.com>
Mon, 12 Jan 2015 20:10:05 +0000 (20:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Jan 2015 20:10:05 +0000 (20:10 +0000)
commiteb329c07c150dfaf539d1d48bedf1572e963348f
tree2b24b3752db923efb7fc4077bacdcf7455ac7950
parent7581a96bfd9219030a8ae8a15f545da0d7eccdda
parent83f14309f17af398ec8ff7f82d9b2f010ea7cd5f
am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""

* commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f':
  Revert "Update protobuf library from 2.3 to 2.6."