Skip to content
Commit 6694c5c6 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-dev am:... 

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 25436996 am: 4a60106a am: 72df9705 am: da3d1059 am: 97f6a0da  -s ours am: 3b47256c am: a7f05048
am: 5712d1fb

Change-Id: Id5d6dd68924837f09d6f2b1178ce41c2d1e81219
parents 54bfe3ac 5712d1fb
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