Materialize

Change-Id: Ia0f4875fcf710af71ed3104f135b0f714c66e4d8
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	res/drawable-hdpi/ic_launcher_soundrecorder.png
	res/drawable-mdpi/ic_launcher_soundrecorder.png
	res/drawable-xhdpi/ic_launcher_soundrecorder.png
	res/drawable-xxhdpi/ic_launcher_soundrecorder.png
	res/drawable-xxxhdpi/ic_launcher_soundrecorder.png

Change-Id: I49cc5280df6001048b26943daee1df682fd34389