OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Oct 2017 02:21:16 +0000 (02:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Oct 2017 02:21:16 +0000 (02:21 +0000)

Trivial merge