OSDN Git Service

Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1...
authorAdrian Roos <roosa@google.com>
Thu, 3 Aug 2017 12:58:59 +0000 (12:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 12:58:59 +0000 (12:58 +0000)
am: b993a3a01d

Change-Id: I41f6ab0a055ad149356287429fa0847e81db473a


Trivial merge