OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
[android-x86/packages-apps-Settings.git] / res / values-ca /
drwxr-xr-x   ..
-rw-r--r-- 32333 arrays.xml
-rw-r--r-- 357516 strings.xml