OSDN Git Service

(root) / android-x86 / ndk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b4d13b df1b5eb)
resolved conflicts for merge of a85d523b to master
authorDerek Sollenberger <djsollen@google.com>
Mon, 11 Jan 2010 22:12:46 +0000 (17:12 -0500)
committerDerek Sollenberger <djsollen@google.com>
Mon, 11 Jan 2010 22:12:46 +0000 (17:12 -0500)

Trivial merge
ndk
About OSDN
Find Software
Develop Software
Help