tree 3a53c45f4234b0329b3a77153c5edf4f32444a6c
parent f32a4fad5dff87d39f15a79dad149a08737819c0
parent 45926efd0f051121b555b25f6de4ed7d39067f29
author Jeff Sharkey <jsharkey@android.com> 1507754080 +0000
committer android-build-merger <android-build-merger@google.com> 1507754080 +0000

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
am: 45926efd0f  -s ours

Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc