| commit | 573c6a4c8db68e12b75093b5ae187ebbb1210790 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Tue Sep 20 03:18:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 20 03:18:56 2016 +0000 |
| tree | 05ed71e4aca039523795e575a6e333c1ea18c5a0 | |
| parent | 543828d06fe3ec01b0c58c508f4ad8030786ea0b [diff] | |
| parent | 9d3efc788218104cc0d66ce1fa1e40a009f50d09 [diff] |
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01 -s ours am: 9d3efc7882 Change-Id: Idfccebdd2c5d81a42799b9f97d1f9710ba45a95b