OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)
am: 9d3706046c

Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef


Trivial merge