OSDN Git Service

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
authorJeff Sharkey <jsharkey@android.com>
Fri, 20 Oct 2017 01:59:35 +0000 (01:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 01:59:35 +0000 (01:59 +0000)
am: 74552f1b98

Change-Id: Ia74aa97493e816c84b65303210e29caa63a28f09


Trivial merge