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:
d71f246
eaa166e
)
am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug...
author
Joe Onorato
<joeo@android.com>
Mon, 11 Oct 2010 22:22:30 +0000
(15:22 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 11 Oct 2010 22:22:30 +0000
(15:22 -0700)
Merge commit '
c0ad216c8ebc74b59074a7538533605eebfd65c3
' into gingerbread-plus-aosp
* commit '
c0ad216c8ebc74b59074a7538533605eebfd65c3
':
Add a configuration option to turn on the screen when you unplug the device.
Trivial merge