OSDN Git Service
(root)
/
android-x86
/
prebuilt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f5d8cb4
dd7dfaf
)
resolved conflicts for merge of dd7dfafb to master
author
Jean-Baptiste Queru
<jbq@google.com>
Mon, 8 Feb 2010 17:08:58 +0000
(09:08 -0800)
committer
Jean-Baptiste Queru
<jbq@google.com>
Mon, 8 Feb 2010 17:08:58 +0000
(09:08 -0800)
Change-Id: I0f27700877d9398a4fd09a8d6167fff03500018e
Trivial merge