Merge "Add basic-level gamma calibration to hardware tunables" into cm-10.2
Conflicts:
	res/values/cm_strings.xml

Change-Id: Ief68ae5264b94aef9919f27faa4042ad7e111e9d