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
This commit is contained in:
Jeff Sharkey
2017-10-11 21:34:24 +00:00
committed by android-build-merger

Diff Content Not Available