Merge "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"
This commit is contained in:
committed by
Android (Google) Code Review
commit
dc5d89e59a