OSDN Git Service

resolved conflicts for merge of 972f65f2 to master
[android-x86/packages-apps-Camera2.git] / tests / res / xml /
drwxr-xr-x   ..
-rw-r--r-- 2665 galaxy_nexus.xml