| commit | a54bfed476559cc7eb3ca47457bb024686b0a7ba | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 22:11:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 22:11:49 2017 +0000 |
| tree | afc22f7516bfb5237f936d9f23b169045dc67cd4 | |
| parent | 0de1d85a01e065baf65d8fe79081d3041c086dfc [diff] | |
| parent | a7f0504849e6f80a4bd8a39088f979fbf2b7dc46 [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 am: 3b47256ccf am: a7f0504849 Change-Id: I08b0a31acd8044b1fb1676052f853bbc1b1201a1