Skip to content
Commit e8af749e 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." into oc-dev am:... 

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc2 am: 3f671b31 am: 8bfef31c
am: c4649e25  -s ours

Change-Id: I874d8afcbd14d28bf7ade224fc7cb72093482e1d
parents 3700554d c4649e25
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