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:
4c9c895
4b0c5ee
)
resolved conflicts w/4b0c5ee8
author
Ed Heyl
<ed@google.com>
Thu, 26 Jul 2012 15:02:49 +0000
(08:02 -0700)
committer
Ed Heyl
<ed@google.com>
Thu, 26 Jul 2012 15:02:49 +0000
(08:02 -0700)
Change-Id: Ic03a161b61d42504a7f45f1ac0ffebe3ac9b9e72
Trivial merge