Automatic translation import

Change-Id: Id2d383b33511f43fa82a563fe4fffea371d0e29c
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

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

Change-Id: I76521fef997d745937beb85637f3b6e815db6bd3