Automatic translation import

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

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

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