misc: merge from pcsxr r91261,r91276
[pcsx_rearmed.git] / jni /
drwxr-xr-x   ..
-rw-r--r-- 3374 Android.mk
-rw-r--r-- 31 Application.mk