| commit | dfe705a2cafba2a260899c8c524d7e779d6bf9c2 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Jul 07 21:08:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 07 21:08:12 2016 +0000 |
| tree | 7b0ddab2c999ff19a268887c0fcc862034caa26c | |
| parent | 9c33b4201b62f7cbe552e7009beafaf30d80bfe9 [diff] | |
| parent | a57cbde2608892707e68dfe3345760c46083b6ae [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 am: a57cbde260 Change-Id: Ide9ce12a3c45722cbdd412e8c41cbf7256453d21