OSDN Git Service

resolved conflicts for merge of 4dcd2ee8 to master
[android-x86/frameworks-base.git] / test-runner /
drwxr-xr-x   ..
-rw-r--r-- 920 Android.mk
drwxr-xr-x - src
drwxr-xr-x - tests