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 22:58:37 +0000 (22:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 22:58:37 +0000 (22:58 +0000)
am: 9c441159f9

Change-Id: I3533fdd4683cb85f66e107c3b4038f1a7ec97dfc


Trivial merge