Skip to content
Commit 29f38676 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev 

* changes:
  AOD: Add hysteresis to pausing the display
  Factor out AlarmTimeout
parents 8626cd18 6023ccbe
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment