derp

Change-Id: If0f5bef4db33a007e2cb8e1c2c553ba2c301dec9
Revert "clean up commit"

This reverts commit d8c9811c75c11753df78e01a92693881a6e9263f.

Conflicts:
	res/values/cm_strings.xml

Change-Id: I6558f8581fbb780c03f2550c29c665027ced3dd7
fix derp

Change-Id: I5b191c96af69f7160a6af523f17e773ff7e6578b
one more derp

This reverts commit 80b93ba6a8532d7804b11aca6a3e24398678bef9.