OSDN Git Service

(root) / android-x86 / ndk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c7ff26 13552d7)
resolved conflicts for merge of e3b115d0 to master
authorYing Wang <wangying@google.com>
Mon, 4 Jan 2010 21:37:36 +0000 (13:37 -0800)
committerYing Wang <wangying@google.com>
Mon, 4 Jan 2010 21:37:36 +0000 (13:37 -0800)

Trivial merge
ndk
About OSDN
Find Software
Develop Software
Help