OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e55b0e2
fa36632
)
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
author
Jean-Baptiste Queru
<jbq@google.com>
Tue, 24 Aug 2010 02:09:14 +0000
(19:09 -0700)
committer
Jean-Baptiste Queru
<jbq@google.com>
Tue, 24 Aug 2010 02:09:14 +0000
(19:09 -0700)
Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74
Trivial merge