OSDN Git Service

resolved conflicts for merge of 59561e0a to master
[android-x86/packages-apps-Settings.git] / tests / res / values-rm /
drwxr-xr-x   ..
-rw-r--r-- 1648 strings.xml