tree 9519e8bb3ef2f992db905fcc6b303c5038b49f9d
parent 620c5cfda070d69606b61f9a5cb3fc142f4ea4ea
parent d6e3d358d43f698bcf98a0ba69a32ffbfb97a7ce
author Jeff Sharkey <jsharkey@android.com> 1507761301 +0000
committer android-build-merger <android-build-merger@google.com> 1507761301 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa
am: d6e3d358d4  -s ours

Change-Id: Iece9faf3d2cbef432450c053d6440d94053bbb00