Skip to content
Commit 4a69ee91 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
am: e6f60d0f

Change-Id: Ia9d41c8a74dd6862e27c9712ff404efa75caeda4
parents c1bcf2ff e6f60d0f
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