OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
32f4fe5
ba7232c
)
am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
author
Daniel Sandler
<dsandler@android.com>
Fri, 18 Nov 2011 05:04:37 +0000
(21:04 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 18 Nov 2011 05:04:37 +0000
(21:04 -0800)
* commit '
da0e7b0c7a0bb1f9f972c3ed042b8cd752031046
':
Tie screen saver to the screen off timeout.
Trivial merge