tree fe3fa6ea1cb8a268456abd91255a58b281b8f812
parent 1018a5d4a198fa32be018f9c7d10d72142c9a6b3
parent 5f17a285f9b64dfb04f786b23902cab2a2bbd1a5
author Jeff Sharkey <jsharkey@android.com> 1507754781 +0000
committer android-build-merger <android-build-merger@google.com> 1507754781 +0000

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

Change-Id: I9971bfff1c0792f78e4afe17a101ba6e6ae0cd2f