| commit | a57cbde2608892707e68dfe3345760c46083b6ae | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 07 20:59:48 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 07 20:59:49 2016 +0000 |
| tree | 2beb5e084137bc1290a6d3c60c749946cb6e1587 | |
| parent | 33597d225bd3b06dd951a9bf1d8b8ca2f0d1672f [diff] | |
| parent | 2642ae57ebc787017819dc3bfcf66992c8aa04a8 [diff] |
Merge "Merge \"API 25 is frozen, so we can\'t change API.\" into nyc-mr1-dev am: 663cfc0f8d" into nyc-mr1-dev-plus-aosp