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

am: 7f108b81b3

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

Diff Content Not Available