OSDN Git Service

(root) / android-x86 / ndk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae9317a d422b4e)
am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
authorRaphael <raphael@google.com>
Mon, 16 Nov 2009 21:18:41 +0000 (13:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Nov 2009 21:18:41 +0000 (13:18 -0800)
Merge commit '6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-mr2

* commit '6dcf42149b183e2a2a062c90d60a2803cf01523a':
  SDK Manager: phase 1 of support for future schemas


Trivial merge
ndk
About OSDN
Find Software
Develop Software
Help