OSDN Git Service

resolved conflicts for merge of 64d592c0 to master
[android-x86/packages-apps-Gallery2.git] / res / values-ja /
drwxr-xr-x   ..
-rw-r--r-- 4602 photoeditor_strings.xml
-rw-r--r-- 14527 strings.xml