OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369...
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)
commit97f6a0da404d945e07c3e5f4bb54a8f4dfc352e0
tree2a11afc6708a91bb49c2bd8f5dec6d0fade7d5a7
parente1ae8489705297ed52f48e7c87f0c8cfcc73f2cf
parentda3d10591aea6d9dc9b90218f8652ec0c5a957a9
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c
am: da3d10591a

Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b