| commit | 92269e5ef854ac83a4681768577529f69b7c52de | [log] [tgz] |
|---|---|---|
| author | Patrick Baumann <patb@google.com> | Tue Nov 19 16:05:31 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 19 16:05:31 2019 -0800 |
| tree | f053c50f5d506daa1f20bcebbe87695ac0a37ca7 | |
| parent | 080ddd5dfd8e20f769b59dea080136fb0efb735c [diff] | |
| parent | 35dd014a79d1da52538fefb2a5f9682b915f4cb1 [diff] |
Merge "DO NOT MERGE Avoids deadlock when applying preferred activities" am: 35dd014a79 Change-Id: I9b4646c9c0674380e37eea44a226b1b279b53f6b