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

Merge "DO NOT MERGE Avoids deadlock when applying preferred activities" am: 35dd014a 

am: 92269e5e

Change-Id: I6d95f0bbdaa146c4d96f8b8c5f715ef2053074be
parents 952dd95b 92269e5e
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