Automatic translation import

Change-Id: I5e39ba1f1f67a3ddcaa99b4338ab6ceb53d82c6b
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/values-ja/strings.xml

Change-Id: Ifc490f04be9a0552db1de97e66e1dac81401af8d