Skip to content
Commit e3e396ac 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 oc-dev am: 31c5adc2 am: 3f671b31" into oc-mr1-dev
am: 383ab095

Change-Id: Ic1d6542b99aa8e559c17826a32ed128610c964b0
parents fd77afd5 383ab095
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