tree 9ea86adf4b5f09195f56560b94f9a27db20339e7
parent 9d3706046c3fc30d6f15a0fda4bae59a1a81ba12
parent 4a60106aa0486cd7bedd138af5981dd307f38792
author Jeff Sharkey <jsharkey@android.com> 1507754851 +0000
committer android-build-merger <android-build-merger@google.com> 1507754851 +0000

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a
am: 4a60106aa0

Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c