OSDN Git Service

resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
[android-x86/packages-apps-Gallery2.git] / res / values-am /
drwxr-xr-x   ..
-rw-r--r-- 4580 photoeditor_strings.xml
-rw-r--r-- 15262 strings.xml