Automatic translation import

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