Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours am: 3f8c97465d am: 2cc87e32c2 am: c8e6a93778
am: 99499e5263
Change-Id: I1ac20b343d17d6d054532dbcca11eaa8543da4e0
This commit is contained in: