OSDN Git Service

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Wed, 26 Jul 2017 16:59:16 +0000 (16:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 16:59:16 +0000 (16:59 +0000)
am: afda883f86

Change-Id: I343ee531e2bf5f658ba0693c7e0e402b395dc282


Trivial merge