OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555e...
authorJeff Sharkey <jsharkey@android.com>
Thu, 12 Oct 2017 01:44:39 +0000 (01:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Oct 2017 01:44:39 +0000 (01:44 +0000)
am: 1bfc9ff526  -s ours

Change-Id: Ibb00ad9497ee1e07bba6085253257cde28e38b7b


Trivial merge