Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera.git into cm-10.1