Automatic translation import

Change-Id: If5a82559d870c6bc8cbed2f2791ea5ee9dc9c886
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