tree e19bd5687deca48bb98ab968aa64afa9aed45b47
parent bf5b9d7e8e1c1a62aa7b9090fdd5e32043b7fc5b
parent 7f00f14d8153be67a266790c3972febc58707110
author Jeff Sharkey <jsharkey@android.com> 1508455906 +0000
committer android-build-merger <android-build-merger@google.com> 1508455906 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours
am: 7f00f14d81

Change-Id: I79f42935ccfa12f7a5e5d22957a06f50825e2dcf