tree 40f38617d63b8bb3073a0baacf34137feab14c32
parent e85152c2fcc1dfed1363f48566d218f3843bba34
parent 43a1f74d7fded022b26acfd74b671b785b4aa9b8
author Sudheer Shanka <sudheersai@google.com> 1474321766 +0000
committer android-build-merger <android-build-merger@google.com> 1474321766 +0000

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558  -s ours
am: 43a1f74d7f

Change-Id: I541e01b2d5d76a49908bd3c1557de9ba84a2cc3d