OSDN Git Service

resolve merge conflicts of 7285e2c2fc to master.
[android-x86/packages-apps-Settings.git] / res / values-hr /
drwxr-xr-x   ..
-rw-r--r-- 30706 arrays.xml
-rw-r--r-- 360145 strings.xml