From: Makoto Onuki <omakoto@google.com>
Date: Thu, 2 Feb 2017 01:10:43 +0000 (+0000)
Subject: DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc
X-Git-Tag: android-x86-7.1-r1~41^2~20^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=963cba5b5b1feea9d66239df6e86fa21c32fd6fd;p=android-x86%2Fframeworks-base.git

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc
am: 01f971dcdc

Change-Id: If5f5e5d47b97e2b8480adc5ca2cb08702056ca87
---

963cba5b5b1feea9d66239df6e86fa21c32fd6fd