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:
0dda5a1
ba3ed0c
)
resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Wed, 8 Sep 2010 22:24:06 +0000
(15:24 -0700)
committer
Jean-Baptiste Queru
<jbq@google.com>
Wed, 8 Sep 2010 22:24:06 +0000
(15:24 -0700)
Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb
Trivial merge