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:
507c3ea
9b4660a
)
resolved conflicts for merge of 9b4660a1 to master
author
Raphael
<raphael@google.com>
Fri, 25 Mar 2011 23:21:38 +0000
(16:21 -0700)
committer
Raphael
<raphael@google.com>
Fri, 25 Mar 2011 23:21:38 +0000
(16:21 -0700)
Change-Id: Ide155e276c6e994ad330a5ac1c2676a7acc1efed
Trivial merge