Skip to content
Commit 1c65520a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into... 

Merge "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" into oc-mr1-dev-plus-aosp
am: da968fb5  -s ours

Change-Id: Iec09725428ddb1ae2cea3936395b9ce9c84ecc84
parents cd4e159b da968fb5
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