OSDN Git Service

resolved conflicts for merge of f90b5141 to master
[android-x86/packages-apps-Settings.git] / res / values-lo-nokeys /
drwxr-xr-x   ..
-rw-r--r-- 960 strings.xml