OSDN Git Service

Merge "AOD: Ensure WakeLock is held for delayed dozeTimeTick" into pi-dev
authorAdrian Roos <roosa@google.com>
Thu, 19 Apr 2018 14:10:52 +0000 (07:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Apr 2018 14:10:52 +0000 (07:10 -0700)
am: 4fca6d6b31

Change-Id: I6664456dd641d9e1abb2fe9d65841fadb2299f37


Trivial merge