OSDN Git Service

resolve merge conflicts of 333ba2d to nyc-mr1-dev
[android-x86/packages-apps-Settings.git] / res / values-ne-rNP /
drwxr-xr-x   ..
-rw-r--r-- 34552 arrays.xml
-rw-r--r-- 573296 strings.xml