OSDN Git Service

resolve merge conflicts of 94c5202965 to oc-dr1-dev
[android-x86/packages-apps-Settings.git] / res / values-is /
drwxr-xr-x   ..
-rw-r--r-- 26782 arrays.xml
-rw-r--r-- 899 config.xml
-rw-r--r-- 462191 strings.xml