OSDN Git Service

Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e
authorAdrian Roos <roosa@google.com>
Fri, 21 Jul 2017 15:09:40 +0000 (15:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Jul 2017 15:09:40 +0000 (15:09 +0000)
am: 4c535d5580

Change-Id: I2c7bf05d801323121ea2f57c5ed191553b5e05bb


Trivial merge