OSDN Git Service

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