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:
1ca1730
aca203f
)
resolved conflicts for merge of aca203ff to ics-mr1
author
Bart Sears
<bsears@google.com>
Mon, 21 Nov 2011 05:03:42 +0000
(21:03 -0800)
committer
Bart Sears
<bsears@google.com>
Mon, 21 Nov 2011 05:11:32 +0000
(21:11 -0800)
Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149
Trivial merge