tree e19bd5687deca48bb98ab968aa64afa9aed45b47
parent 3c30346de25ec166d65851a5c8656c8e0c49e030
parent 73a4e88df80d11360c41f3f7f9ae89294eeb14bf
author Jeff Sharkey <jsharkey@android.com> 1508457034 +0000
committer android-build-merger <android-build-merger@google.com> 1508457034 +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

Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614