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:34:24 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 21:34:24 +0000 (21:34 +0000)
am: 97f6a0da40  -s ours

Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74


Trivial merge