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:11:51 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 22:11:51 +0000 (22:11 +0000)
commit5712d1fb47e94be9481d4d1f872c5fbef7e2cfc7
treefbb49e11ea3f27b0689d4715be7480efe5cfe972
parente2a1e9f7d80bf2b6fd7f6583cf9e99cd96e91e7a
parenta7f0504849e6f80a4bd8a39088f979fbf2b7dc46
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

Change-Id: Ib17c9471d7f3bdde18e3de4ad693fd9ef5312059