From: Edgar Wang <edgarwang@google.com>
Date: Thu, 27 Jun 2019 06:36:34 +0000 (+0000)
Subject: Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=98a51d108034675dddd7808de9c30a0ab5c2d14b;p=android-x86%2Fframeworks-base.git

Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev
---

98a51d108034675dddd7808de9c30a0ab5c2d14b