| commit | 96be5a19ef5afd5a80f8889e3c564cb51fd5830c | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Wed Sep 21 04:34:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 04:34:01 2016 +0000 |
| tree | c3a400e3d5e3b4302d1bcede70b5692fe28b00e8 | |
| parent | 89aa9da31587eb6bdfd40cab4a24b27284225fbb [diff] | |
| parent | 65b110af60f0d5a4a3e4b2d76fba1a6e4333f5f4 [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 am: 34a5ce150d am: 65b110af60 -s ours Change-Id: I0d01d9857ddbc82c4c4e02b7b15b8514fab10499