OSDN Git Service

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

Change-Id: I02c6f8314289abbc0639c634c478f293ecd1d679


Trivial merge