| commit | 80c1edfcd8a3a7f1cbdecaadbdb41d9c1a024328 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jan 18 22:27:50 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 18 22:28:00 2017 +0000 |
| tree | 646ce17f77e17d6e7aa9e46c65ff7d00bde4be1f | |
| parent | 14eb4cdfe1e4094f3852b0bab0956250baf61390 [diff] | |
| parent | cd7c8d4d6498c922f8166be228120675cd87c6a9 [diff] |
Merge changes from topic 'am-4c35a7750ff942229896a20b4a9f05ce' * changes: DO NOT MERGE: Revert "Fix build" am: a0a908f5d6 am: 0a1a0e6e61 -s ours DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: 24d8553316 -s ours am: 572dfccfc1 -s ours