Conflicts: src/android/customCamera/res/layout/activity_camera_view.xml src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java