Skip to content
Commit 4ff7290d 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: f718585b" into oc-mr1-dev-plus-aosp
am: 609a6cf1  -s ours

Change-Id: I0d1ee4c0cb2c10b68eaf9587bc02c89a915fa8a4
parents a0badaf3 609a6cf1
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