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)
commit29f38676eb4141704d339457bdb2399bd4124296
tree83046e40da738af34cfced9e48ffbfa650a398a1
parent8626cd184b8448d52ead6b9562db0ef6bfea0718
parent6023ccbea1568d8b22db82cac9bf7a03367d0a61
Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev

* changes:
  AOD: Add hysteresis to pausing the display
  Factor out AlarmTimeout