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:
baa9701
dd14acc
)
resolved conflicts for merge of dd14acc3 to jb-mr1-dev
author
Jean-Baptiste Queru
<jbq@google.com>
Fri, 10 Aug 2012 19:42:18 +0000
(12:42 -0700)
committer
Jean-Baptiste Queru
<jbq@google.com>
Fri, 10 Aug 2012 19:42:18 +0000
(12:42 -0700)
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
Trivial merge