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

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into... 

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d370604 am: b4d23d55 am: e1ae8489  -s ours am: 7f108b81 am: 4a71a2da am: 0de1d85a" into oc-mr1-dev-plus-aosp
am: a04a837f  -s ours

Change-Id: I6ea442a00fe0ca7a6af767ae427a0d2b8256b42c
parents 900699c1 a04a837f
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