From: Suprabh Shukla <suprabh@google.com>
Date: Thu, 2 Feb 2017 23:35:42 +0000 (+0000)
Subject: DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d... 
X-Git-Tag: android-x86-7.1-r1~113
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=138c99e8c033d106373b9802afb1c19c43532adc;p=android-x86%2Fframeworks-base.git

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e  -s ours am: ec3e2b9dcb  -s ours am: 483b561f41 am: 6e850f85fc  -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a  -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428
am: 710a7e40dc

Change-Id: Ifbb162d177ef475d7abd7a97d632493fee5f4085
---

138c99e8c033d106373b9802afb1c19c43532adc