tree fc8ba572551442958b2765e06f5f463380f926fa
parent 51bcb058adfcf50d22226ad6c7d676cdab01d241
parent 1d053b3be8492ad5ca2344b1bf2c91a31b635230
author Sudheer Shanka <sudheersai@google.com> 1474330370 +0000
committer android-build-merger <android-build-merger@google.com> 1474330370 +0000

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e  -s ours
am: 1d053b3be8  -s ours

Change-Id: I359bae35d6698349370b4f9a51427f10eb2bbdf3