commit | 680b4dd14e6d38878be822bd14a22e3fe37b4e94 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Sep 20 05:53:20 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 20 05:53:20 2016 +0000 |
tree | ab67fafc091eec21922297f9501afd9cc6423b1b | |
parent | 2cc87e32c24a7e43926325ae1e8f2598d582c591 [diff] | |
parent | eacf98bf52e84d6f96620357e41dc8e91075ba97 [diff] |
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours am: eacf98bf52 Change-Id: I2a2e0f481a3a9947f6e5c3b11bf3c4624aca5404