| commit | d7e8118bff7ccd814e83afe10de709bde369c6ba | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Tue Jan 13 20:31:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 20:31:12 2015 +0000 |
| tree | f036bed1065fc24c6e678cac2661df70f98128d3 | |
| parent | 51ba400e1f21db7ef17e19ffb0a33a58acebd1e9 [diff] | |
| parent | eb329c07c150dfaf539d1d48bedf1572e963348f [diff] |
am eb329c07: am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6."" * commit 'eb329c07c150dfaf539d1d48bedf1572e963348f': Revert "Update protobuf library from 2.3 to 2.6."