tree 7d9302399e4862527684a99ae9a2f39779394b74
parent ff9a8d74c7810c3105e30dbde8325e8f264920b4
parent 3fca892d3e3b1bab481c92c8ec5297591daf2f5c
author Sudheer Shanka <sudheersai@google.com> 1474327488 +0000
committer android-build-merger <android-build-merger@google.com> 1474327488 +0000

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

Change-Id: I4d66089c6ec8743f119dd4aab641b22ebdad7b5c