| commit | 4a69ee914c83b0bebe0c3a6d62f4abcb85328b32 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:23:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:23:11 2017 +0000 |
| tree | 3d24677b9c7aadc33206f0a11e18831715aab168 | |
| parent | c1bcf2ff950c667a86a45ad482d4c3cbfa0a3482 [diff] | |
| parent | e6f60d0fcb551e28bfefc9ed46e8e938df43ce1f [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb Change-Id: Ia9d41c8a74dd6862e27c9712ff404efa75caeda4