OSDN Git Service

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

Change-Id: I7a72aa1793c5e45434f50c4d810164fbbfd70ef9


Trivial merge