tree 0bf199c2c5d61401f22c2edb94ca70d91c6e2e13
parent c1b2e6db98e4be210555d23cb9de108055676182
parent a4c9bbefdf8259e419eacf011c6f05161babc442
author Sudheer Shanka <sudheersai@google.com> 1474321847 +0000
committer android-build-merger <android-build-merger@google.com> 1474321847 +0000

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79
am: a4c9bbefdf

Change-Id: I224c2cf56d53acf091a11372f82d1305052c6f18