Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df
am: 2f0228c153 -s ours
Change-Id: Icd41b479bb5b365173e146791c1ee858f2265128
This commit is contained in: