tree 2a7229e95b729fff563f08a7494d39ee35139e3b
parent 952dd95b465f3f17c96fac00b1b551f2c1de1bc5
parent 92269e5ef854ac83a4681768577529f69b7c52de
author Patrick Baumann <patb@google.com> 1574209220 -0800
committer android-build-merger <android-build-merger@google.com> 1574209220 -0800

Merge "DO NOT MERGE Avoids deadlock when applying preferred activities" am: 35dd014a79
am: 92269e5ef8

Change-Id: I6d95f0bbdaa146c4d96f8b8c5f715ef2053074be