Automatic translation import

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