| commit | eb329c07c150dfaf539d1d48bedf1572e963348f | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Mon Jan 12 20:10:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 12 20:10:05 2015 +0000 |
| tree | 2b24b3752db923efb7fc4077bacdcf7455ac7950 | |
| parent | 7581a96bfd9219030a8ae8a15f545da0d7eccdda [diff] | |
| parent | 83f14309f17af398ec8ff7f82d9b2f010ea7cd5f [diff] |
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."