Fix rebase derp.

Change-Id: Ie009eda79be04a4eb76272bbfdf4766e642d0918

Conflicts:
	res/values/cm_strings.xml