OSDN Git Service

(root) / android-x86 / sdk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1903592 2b2c600)
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)
commit606ba9411f31007380c30cdffed98a64f0e91404
treec37edd30d0dc6471c9cb395110309f273f188137tree | snapshot
parent1903592d5875fe9c856cda364a5c05c213411748commit | diff
parent2b2c600776ff5dc6d36f650e44ad304135c36f81commit | diff
Merge korg/donut into korg/master

Conflicts:

tools/eclipse/plugins/README.txt
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
emulator/qtools/trace_reader.cpp diff1 | diff2 | blob | history
sdk
About OSDN
Find Software
Develop Software
Help