From: Suprabh Shukla <suprabh@google.com>
Date: Thu, 2 Feb 2017 23:13:03 +0000 (+0000)
Subject: Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev... 
X-Git-Tag: android-x86-7.1-r1~41^2~1^2~1^2^2^2^2^2^2^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bf1c88f34e85c032f32f6d211958b83145a67222;p=android-x86%2Fframeworks-base.git

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36  -s ours
am: d9c8155943  -s ours

Change-Id: I9dfff7471440739580e7827cdb4484fad6900048
---

bf1c88f34e85c032f32f6d211958b83145a67222