OSDN Git Service
(root)
/
android-x86
/
device-vm-vm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5ef3eda
11ba9d7
)
Merge branch 'froyo-x86' into gingerbread-x86
gingerbread-x86
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 20 Apr 2011 09:08:56 +0000
(17:08 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 20 Apr 2011 09:08:56 +0000
(17:08 +0800)
Conflicts:
vm_defconfig
Trivial merge