Automatic translation import

Change-Id: Ia6a34ad5a5e7a16356cbda5181a7348d243bdb77
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into cm-11.0
Automatic translation import

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