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

Change-Id: Id50190ce08ae0d0f1e417db0f7290b3c7ea5c2fe
parents f65d1669 4a69ee91
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