Automatic translation import

Change-Id: Ia44f2b32ee8f174c1a5c96b7b76115e707e2bf26
Automatic translation import

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

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

Change-Id: If7a1b35e6357205e54941e889c78252faf6961ad