tree 3a53c45f4234b0329b3a77153c5edf4f32444a6c
parent 89791cb5c3c904c98a0b2b5cde4f4b596016545c
parent ba66bb8a4385bcb515b6adb7fb8b646ba913922a
author Jeff Sharkey <jsharkey@android.com> 1507754123 +0000
committer android-build-merger <android-build-merger@google.com> 1507754123 +0000

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
am: ba66bb8a43  -s ours

Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141