OSDN Git Service

Merge korg/donut into korg/master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 03:35:55 +0000 (20:35 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 03:35:55 +0000 (20:35 -0700)
commit6a95adec3a5fa107f2bec11d77a66408f239c5ac
tree703c0faa87326e344881fc8bdce11358195c09d6
parent063cc3ec35c3e8b1860645b15b5b643ce713c7fc
parentec537042338c000af4526099599e128be63bee68
Merge korg/donut into korg/master

Conflicts:

libcore/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java
vm/oo/Class.c
dexdump/DexDump.c
libcore/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java
vm/Android.mk
vm/Native.c
vm/analysis/CodeVerify.c
vm/mterp/out/InterpC-armv4t.c
vm/oo/Class.c