fix
Merge branch 'cm-10.1' of https://github.com/metaiiica/android_packages_apps_Camera into cm-10.1