Automatic translation import

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