OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am...
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 21:04:06 +0000 (21:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 21:04:06 +0000 (21:04 +0000)
commite6f60d0fcb551e28bfefc9ed46e8e938df43ce1f
tree63eaccec4416fe28ee42d3659c9f65f4ed93d09c
parent311fa22ecb120df7f844864ff0b1265892a78f3d
parent98371ee7c9b5175cad2e0b7060cc5983bcb828d7
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6  -s ours am: 5f17a285f9
am: 98371ee7c9

Change-Id: I02c6f8314289abbc0639c634c478f293ecd1d679