Skip to content
Commit 6530612c 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" into oc-dr1-dev-plus-aosp
am: 6ef8866b

Change-Id: Ic989ee531576564282dbc4ab065f4dd6b99a6c4c
parents da968fb5 6ef8866b
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