OSDN Git Service

resolved conflicts for merge of dcea7639 to ub-camera-glacier
[android-x86/packages-apps-Camera2.git] / res / values-nl /
drwxr-xr-x   ..
-rw-r--r-- 36676 strings.xml