DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63

am: 8916c30c54  -s ours

Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36
This commit is contained in:
Jeff Sharkey
2017-10-11 21:20:52 +00:00
committed by android-build-merger

Diff Content Not Available