tree ab67fafc091eec21922297f9501afd9cc6423b1b
parent 6b4e509c25052e24015d4a6c33d471a9cface502
parent 7f99a18e0e0b92ceab11487a99c5b5016d5ae3e6
author Sudheer Shanka <sudheersai@google.com> 1474333198 +0000
committer android-build-merger <android-build-merger@google.com> 1474333198 +0000

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff  -s ours
am: 7f99a18e0e

Change-Id: Ic6e91076e979291bfcbc87bc2e8d71ddd4c700de