OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
[android-x86/packages-apps-Settings.git] / res / values-b+sr+Latn /
drwxr-xr-x   ..
-rw-r--r-- 27075 arrays.xml
-rw-r--r-- 403927 strings.xml