OSDN Git Service

Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 21:09:20 +0000 (21:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 21:09:20 +0000 (21:09 +0000)
am: 9c39da39df

Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47


Trivial merge