OSDN Git Service

resolved conflicts for merge of 2a612605 to master
[android-x86/packages-apps-Settings.git] / tests / res / values-zh-rTW /
drwxr-xr-x   ..
-rw-r--r-- 1706 strings.xml