Automatic translation import

Change-Id: I88325e998e1134bb4df88a1ad943a040546555a3
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Camera2 into HEAD