OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369...
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)
am: da3d10591a

Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b


Trivial merge