OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 20:30:25 +0000 (20:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 20:30:25 +0000 (20:30 +0000)
commit5f17a285f9b64dfb04f786b23902cab2a2bbd1a5
tree18d74257ed8caa2a76f26d32e0b5ceacc7984b5c
parente721fbddb51f4786d76072e56cf5a71a48584458
parent09984216e6ac885f1d5cff8d67ae152bd825de6c
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
am: 09984216e6  -s ours

Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120