| commit | 3b47256ccf96a785b3697d5af30cc767f552b1af | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:34:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:34:24 2017 +0000 |
| tree | 9519e8bb3ef2f992db905fcc6b303c5038b49f9d | |
| parent | 7f108b81b3fd041fbba09fb313eccef4bbde980c [diff] | |
| parent | 97f6a0da404d945e07c3e5f4bb54a8f4dfc352e0 [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74