| commit | b9b86f644f47e6e3bdedc5b2419e9d4af1c8b455 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Thu Jan 15 23:02:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 15 23:02:01 2015 +0000 |
| tree | 8f2ca204b2d2bc842b7fc89610988c619b5253df | |
| parent | 8d129cbf5a8affebaf0883450d637132e2f9f512 [diff] | |
| parent | 4df903dbc71c48e2db6fae9390795b81782470b4 [diff] |
am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6.""" * commit '4df903dbc71c48e2db6fae9390795b81782470b4': Revert "Revert "Update protobuf library from 2.3 to 2.6.""