tree 959da77243d6fd5974cefb16901bd872ab2af968
parent 260dc7fdf5b400666be3153e8d4223322d035b23
parent d8c77c94ff404d647f27546e7694f610bf0e2cb9
author Adrian Roos <roosa@google.com> 1524227518 -0700
committer android-build-merger <android-build-merger@google.com> 1524227518 -0700

Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
am: d8c77c94ff

Change-Id: Icc60544a98e6a0357207d45600c8f943efc0d169