Commits
Sudheer Shanka authored and android-build-merger committed 6b77a4ee553M
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 Change-Id: I8c985dee46cceb5ad8cf3beb6ac9839d9a9d2058
Showing diff to96d70301e61