tree 4b212f635d9c61f706b2f681938b39d66ef59f38
parent 045c82dec0f1b66d402fb116b3069adec559a811
parent 4c8e31db5da367e3ce6a369bba4c4dca0422b655
author Jeff Sharkey <jsharkey@android.com> 1507772271 +0000
committer android-build-merger <android-build-merger@google.com> 1507772271 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4  -s ours am: 620c5cfda0 am: e286f08000 am: 1b1ea965ee
am: 4c8e31db5d  -s ours

Change-Id: I60f833f404e3ca2aeea5d8ea0cb91eb3137cc694