OSDN Git Service

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