tree fe35ca643838769dd856507bdc0ac0ebe21459ef
parent 1c7cdde2d310de34a59bc5080a440115ea417471
parent 1f2a5d36224b3ab1326e73696f4f6a064764a4ce
author Jeff Sharkey <jsharkey@android.com> 1508451020 +0000
committer android-build-merger <android-build-merger@google.com> 1508451020 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: 1f2a5d3622  -s ours

Change-Id: I2bf88a0e4808e7d3db67e7944696121c284ed7ae