tree 51260ab29ac7835b7a0ed7d0e21e1e4968bb3aaf
parent de93e6912f299b00949c9eae7ba4c97a63f852fc
parent be1577ae599a4bd63bf8646a1f318dd9aabd4ae6
author Jorim Jaggi <jjaggi@google.com> 1499977227 +0000
committer android-build-merger <android-build-merger@google.com> 1499977227 +0000

Merge "Also go to sleep when dozing" into oc-dr1-dev
am: be1577ae59

Change-Id: If8fea9defc84fcd3f7f8f2c98dcb00f13f7ffffc