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

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

Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc2 am: 3f671b31" into oc-mr1-dev am: 383ab095" into oc-mr1-dev-plus-aosp
am: 289b4d8c  -s ours

Change-Id: Id4fe5d06de655a44e1b0a40aed44acc32df3b30e
parents 6f2ab66f 289b4d8c
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