| commit | 29f38676eb4141704d339457bdb2399bd4124296 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Jun 30 21:22:16 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 30 21:22:16 2017 +0000 |
| tree | 83046e40da738af34cfced9e48ffbfa650a398a1 | |
| parent | 8626cd184b8448d52ead6b9562db0ef6bfea0718 [diff] | |
| parent | 6023ccbea1568d8b22db82cac9bf7a03367d0a61 [diff] |
Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev * changes: AOD: Add hysteresis to pausing the display Factor out AlarmTimeout