tree 64b956f03ef0feeaaad550f38d841cf74353c78d
parent fad1e6a31507c220086e2d1456125bd356c1d998
parent a954c8c716d3a08f5aa2d268dde4a71e188801b0
author Jeff Sharkey <jsharkey@android.com> 1508354513 +0000
committer android-build-merger <android-build-merger@google.com> 1508354513 +0000

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97  -s ours am: 45fc104958  -s ours am: 19fa568b39 am: 2bf724509c
am: a954c8c716

Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545