Automatic translation import

Change-Id: Ia44f2b32ee8f174c1a5c96b7b76115e707e2bf26
Merge branch 'cm' into HEAD

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

Change-Id: I83db8450fe4ea101625cff833ce9b0d0230f42eb
Signed-off-by: DHOMD <DHO@dho.im>