Automatic translation import

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