Skip to content
Commit 5f17a285 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 

am: 09984216  -s ours

Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120
parents e721fbdd 09984216
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