Delete Camera.java.orig
Delete Intent.java.rej
Delete Camera.java.rej
Delete MediaStore.java.orig
Delete MediaStore.java.rej
Delete AndroidManifest.xml.rej