OSDN Git Service

resolved conflicts for merge of c0dd3adf to lmp-dev-plus-aosp
[android-x86/packages-apps-Camera2.git] / res / menu /
drwxr-xr-x   ..
-rw-r--r-- 284 filmstrip_context_menu.xml
-rw-r--r-- 1174 filmstrip_menu.xml