tree fbb49e11ea3f27b0689d4715be7480efe5cfe972
parent 383ab095f5793a7ed9c3151ecbaddeb869e8abc2
parent 4a71a2daf6f4c34110484c0f355b4df5dd3db5f1
author Jeff Sharkey <jsharkey@android.com> 1507757910 +0000
committer android-build-merger <android-build-merger@google.com> 1507757910 +0000

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

Change-Id: Id8a401121d8bff24b5695f0ad0d4c923da93995c