OSDN Git Service

resolve merge conflicts of f2801e4 to nyc-mr1-dev
[android-x86/packages-apps-Settings.git] / res / values-ar /
drwxr-xr-x   ..
-rw-r--r-- 30546 arrays.xml
-rw-r--r-- 488864 strings.xml