OSDN Git Service

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 19 Oct 2017 23:50:34 +0000 (23:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 23:50:34 +0000 (23:50 +0000)
am: 73a4e88df8

Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614


Trivial merge