tree a16c405f893bd19ca1b3a9043c12b8f5f1ef1684
parent 280a51f2446ec196dc9cc356a1b1a4fad4ee4898
parent 3d84027987ae264bca4ea491bb0a8ef590f17ab3
author Sudheer Shanka <sudheersai@google.com> 1474432977 +0000
committer android-build-merger <android-build-merger@google.com> 1474432977 +0000

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558  -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2  -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986  -s ours am: 7efc56cc65 am: 3a87b6773b
am: 3d84027987  -s ours

Change-Id: Ia2bdad372343fae7e3ba523c691f523c9ce92c41