Skip to content
Commit e0e1c8ae 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
am: 98371ee7

Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5
parents 4e733f30 98371ee7
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