OSDN Git Service

resolved conflicts for merge of aae09fb1 to gb-ub-photos-denali
[android-x86/packages-apps-Camera2.git] / res / values-ca /
drwxr-xr-x   ..
-rw-r--r-- 27536 strings.xml