| commit | 2642ae57ebc787017819dc3bfcf66992c8aa04a8 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Jul 07 20:58:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 07 20:58:58 2016 +0000 |
| tree | 8baf277458ca884913503d7af8d52aee44314fca | |
| parent | 012f8669967b996b2f0b67f7ce431b31e7fa1174 [diff] | |
| parent | 663cfc0f8d94a14e79960a4ff801c6a7c5930d87 [diff] |
Merge \"API 25 is frozen, so we can\'t change API.\" into nyc-mr1-dev am: 663cfc0f8d Change-Id: I5dbe4256bc61672658b0e755d1fa4c5cd36e140a