OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0493e24 289d80e)
Merge commit '289d80ee' into manualmerge2
authorJesse Wilson <jessewilson@google.com>
Thu, 23 Jul 2009 18:10:14 +0000 (11:10 -0700)
committerJesse Wilson <jessewilson@google.com>
Thu, 23 Jul 2009 18:10:14 +0000 (11:10 -0700)
Conflicts:
tools/droiddoc/src/DroidDoc.java
tools/droiddoc/test/stubs/func.sh


Trivial merge
build
About OSDN
Find Software
Develop Software
Help