OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af82f81
7b7a397
)
Merge remote-tracking branch 'korg/froyo-release' into froyo-x86
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 25 Mar 2011 09:29:03 +0000
(17:29 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 25 Mar 2011 09:29:03 +0000
(17:29 +0800)
Conflicts:
core/version_defaults.mk
Trivial merge