Skip to content
Commit 98371ee7 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-mr2-dev... 

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216  -s ours
am: 5f17a285

Change-Id: I9971bfff1c0792f78e4afe17a101ba6e6ae0cd2f
parents 1018a5d4 5f17a285
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