OSDN Git Service

(root) / android-x86 / ndk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70b7e21 c886f42)
Merge korg/donut into korg/master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 00:25:52 +0000 (17:25 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 00:25:52 +0000 (17:25 -0700)
Conflicts:

tools/eclipse/plugins/README.txt
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java


Trivial merge
ndk
About OSDN
Find Software
Develop Software
Help