Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Camera2 into HEAD