tree 1a94d2393748b061aada9d5abe1fb58710874212
parent e286f08000d857d8e13c27921ececd9f3fd7bf30
parent bbcb8e49764f7f4c11700f5a8c82ee2394bc9d4c
author Jeff Sharkey <jsharkey@android.com> 1507762273 +0000
committer android-build-merger <android-build-merger@google.com> 1507762273 +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
am: bbcb8e4976

Change-Id: I924de4599fbf76a83d06cc6e0982bd73067c033a