Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2

am: e1ae848970  -s ours

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

Diff Content Not Available