Automatic translation import

Change-Id: I4575e0f6e164d7546c8ed263e6b754a7465115db
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kk_mkt

Conflicts:
	res/values-zh-rCN/cm_strings.xml

Change-Id: Ibfdd1abc097b8afe0d17f447001f979838471316