OSDN Git Service

resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad
[android-x86/packages-apps-Gallery2.git] / res / values-es-rUS /
drwxr-xr-x   ..
-rw-r--r-- 6974 filtershow_strings.xml
-rw-r--r-- 37188 strings.xml