Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064 am: 8bdd94e292

am: f70906f2da  -s ours

Change-Id: I13c9c64d607d6ab5a4358786c3974c1920a4e679
This commit is contained in:
Jeff Sharkey
2017-10-11 21:53:47 +00:00
committed by android-build-merger

Diff Content Not Available