Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb

am: 4a69ee914c  -s ours

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

Diff Content Not Available