OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
[android-x86/packages-apps-Settings.git] / tests /
drwxr-xr-x   ..
-rw-r--r-- 394 Android.mk
-rw-r--r-- 3511 AndroidManifest.xml
drwxr-xr-x - res
drwxr-xr-x - src