Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/Team-Hydra/android_packages_apps_Camera into cm-10.1