OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
[android-x86/packages-apps-Settings.git] / res / values-uk /
drwxr-xr-x   ..
-rw-r--r-- 34003 arrays.xml
-rw-r--r-- 368278 strings.xml