OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8626cd1
6023ccb
)
Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev
author
Adrian Roos
<roosa@google.com>
Fri, 30 Jun 2017 21:22:16 +0000
(21:22 +0000)
committer
Android (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