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:34:24 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 21:34:24 +0000 (21:34 +0000)
commit3b47256ccf96a785b3697d5af30cc767f552b1af
tree9519e8bb3ef2f992db905fcc6b303c5038b49f9d
parent7f108b81b3fd041fbba09fb313eccef4bbde980c
parent97f6a0da404d945e07c3e5f4bb54a8f4dfc352e0
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a
am: 97f6a0da40  -s ours

Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74