| commit | df043ee75cffd64017fd5a571b1e79ee763ea62e | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 23:06:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 23:06:17 2017 +0000 |
| tree | f5209bcdb2c1bb340abfbacf84db94e3b8f39b4c | |
| parent | 1c65520aeb7a8bc8c83ab479561d86c60f70a7d5 [diff] | |
| parent | 6530612cee5ebdf4c1f38c09699d3ccf46794ed6 [diff] |
Merge "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" into oc-dr1-dev-plus-aosp am: 6ef8866b04 am: 6530612cee -s ours Change-Id: I4f9d6946e30f63200b66c0c04744feccc03f267a