From: Sudheer Shanka <sudheersai@google.com>
Date: Tue, 20 Sep 2016 06:33:24 +0000 (+0000)
Subject: Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358e... 
X-Git-Tag: android-x86-7.1-r1~695^2~6^2~21^2~38
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7efc56cc65;p=android-x86%2Fframeworks-base.git

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

Change-Id: I1c1edf783ae5c466ed8c89978de5d5dfd9adb643
---

7efc56cc65f5eaa2ecb9c0bc0acb698cb4f34172