You're doing it wrong

Signed-off-by: Daniel <daxx4182@gmail.com>
Merge branch 'jb4.2' of https://github.com/XYAOSP/packages_apps_Camera into jb4.2

Signed-off-by: Daniel <daxx4182@gmail.com>
Revert "Fix error (idk)"

This reverts commit 790004652a84ac5ef686ced6258a65d26f290a54.

Conflicts:
	src/com/android/camera/Util.java