Skip to content
Commit 7f108b81 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 nyc-mr1-dev... 

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d370604 am: b4d23d55
am: e1ae8489  -s ours

Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be
parents 31c5adc2 e1ae8489
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