tree 1acefac006e5f72b7be101808e673ee4018c79b6
parent d20cad62ee375c2f664ef89c9606412916edc3d8
parent 7555eb508ccc8fdf3798d9242cdc96d87e818b53
author Jeff Sharkey <jsharkey@android.com> 1507754562 +0000
committer android-build-merger <android-build-merger@google.com> 1507754562 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9
am: 7555eb508c

Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d