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:
3463d0e
76aa8d0
)
resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Wed, 15 Dec 2010 00:23:19 +0000
(16:23 -0800)
committer
Jean-Baptiste Queru
<jbq@google.com>
Wed, 15 Dec 2010 00:23:36 +0000
(16:23 -0800)
Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98
Trivial merge