OSDN Git Service

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

Change-Id: I8710b4b748d415bb3c44ec8b5e14010f70468261


Trivial merge