OSDN Git Service

resolved conflicts for merge of 3eae287e to master
[android-x86/dalvik.git] / dalvikvm /
drwxr-xr-x   ..
-rw-r--r-- 1564 Android.mk
-rw-r--r-- 8749 Main.c