DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e
am: f2bb102df4
Change-Id: I2bdc9a554bd23bba0a7534adc58d4c86d49ed239
This commit is contained in: