tree 7f93eb4c657a80cf52a418030575f835d5cd6fba
parent 5505296760ca6e5d3869640479ed3753cee0ee6a
parent 1701a255845771c4073abef204dab37b49cc2f7a
author Sudheer Shanka <sudheersai@google.com> 1474335897 +0000
committer android-build-merger <android-build-merger@google.com> 1474335897 +0000

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

Change-Id: I9519be12a3e3a9d8742f9d1fa715fc1307dfd5cf