OSDN Git Service

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

Change-Id: I13c9c64d607d6ab5a4358786c3974c1920a4e679


Trivial merge