Skip to content
Commit 43416238 authored by Patrick Baumann's avatar Patrick Baumann Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Avoids deadlock when applying... 

[automerger skipped] Merge "DO NOT MERGE Avoids deadlock when applying preferred activities" am: 35dd014a am: 92269e5e
am: ff21f7b0 -s ours
am skip reason: subject contains skip directive

Change-Id: If0a866b489e00c333da157c4a3d590cbe9fad032
parents 1b6300cd ff21f7b0
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