OSDN Git Service

resolved conflicts for merge of c62fc717 to master
[android-x86/dalvik.git] / dalvikvm /
drwxr-xr-x   ..
-rw-r--r-- 1992 Android.mk
-rw-r--r-- 8748 Main.c