OSDN Git Service

resolved conflicts for merge of 98f3aff3 to master
[android-x86/packages-apps-Settings.git] / tests / res / values-nl /
drwxr-xr-x   ..
-rw-r--r-- 1754 strings.xml