OSDN Git Service

resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp
[android-x86/packages-apps-Settings.git] / res / xml-hr /
drwxr-xr-x   ..
-rw-r--r-- 4863 timezones.xml