From: Adrian Roos <roosa@google.com>
Date: Wed, 23 Aug 2017 21:02:04 +0000 (+0000)
Subject: Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1... 
X-Git-Tag: android-x86-9.0-r1~397^2~21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=363d102729803e0a2cd4b2d114783567bd85c029;p=android-x86%2Fframeworks-base.git

Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev am: e45c956f69
am: f5c9bd16af

Change-Id: Id5ca4ac29e48b36f4dd1183a69b95b6146805569
---

363d102729803e0a2cd4b2d114783567bd85c029