tree 9519e8bb3ef2f992db905fcc6b303c5038b49f9d
parent 61d6dd8185e3b02b83bd4635cf0c7872392226e9
parent af70ac291457415b2b2e35f63b8b31bb1cb0d00a
author Jeff Sharkey <jsharkey@android.com> 1508461029 +0000
committer android-build-merger <android-build-merger@google.com> 1508461029 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc  -s ours am: edb6b17ebc  -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b  -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106
am: af70ac2914  -s ours

Change-Id: Ie750d6963f29c0f60a6e2e4ef2a0e8fa4201e06a