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 22:26:38 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 22:26:38 +0000 (22:26 +0000)
commit6694c5c6f0404c1ea64c0d6fadc2c746ef2bd678
treec901d5ac3407bcc98b36b3e9a26e9eb531cd0150
parent54bfe3acddef1c15ed662afa90c2d0791a122d23
parent5712d1fb47e94be9481d4d1f872c5fbef7e2cfc7
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 am: 3b47256ccf am: a7f0504849
am: 5712d1fb47

Change-Id: Id5d6dd68924837f09d6f2b1178ce41c2d1e81219