Skip to content
Commit c06c27c5 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746... 

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746 am: 7555eb50 am: 5d60a49d am: 8916c30c  -s ours am: ba1f2d25 am: 300e6ffa am: f1f2a61f am: 92d80b72 am: d6e3d358  -s ours am: bbcb8e49 am: 753a9ab3 am: 065dc70c" into oc-mr1-dev-plus-aosp
am: 1bfc9ff5  -s ours

Change-Id: Ibb00ad9497ee1e07bba6085253257cde28e38b7b
parents 4ff7290d 1bfc9ff5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment