OSDN Git Service

Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Fri, 30 Jun 2017 21:22:16 +0000 (21:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 30 Jun 2017 21:22:16 +0000 (21:22 +0000)
* changes:
  AOD: Add hysteresis to pausing the display
  Factor out AlarmTimeout


Trivial merge