OSDN Git Service

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am...
authorJeff Sharkey <jsharkey@android.com>
Fri, 20 Oct 2017 01:51:28 +0000 (01:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 01:51:28 +0000 (01:51 +0000)
am: 45829c0c41

Change-Id: If6545cd5d279f973360f34bc792411407a2b037d


Trivial merge