OSDN Git Service

Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1...
authorAdrian Roos <roosa@google.com>
Wed, 23 Aug 2017 21:02:04 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Aug 2017 21:02:04 +0000 (21:02 +0000)
am: f5c9bd16af

Change-Id: Id5ca4ac29e48b36f4dd1183a69b95b6146805569


Trivial merge