Automatic translation import

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

Conflicts:
	res/values-ja/strings.xml
	res/values-sr/strings.xml

Change-Id: I257ba1f72ce2fe21cb79cd0776d517623078bb73