OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
[android-x86/packages-apps-Settings.git] / res / values-af /
drwxr-xr-x   ..
-rw-r--r-- 28870 arrays.xml
-rw-r--r-- 299720 strings.xml