Fix drawable being displayed empty when re-entering the target edit
dialog.

Change-Id: I032a8d8b348803448365ed81246c556da6ff4cc4
Add basic-level gamma calibration to hardware tunables

Change-Id: I3223cb111889be71175dee67723ae44cba051e23
Merge "Fix drawable being displayed empty when re-entering the target edit dialog." into cm-10.2
Merge "Add basic-level gamma calibration to hardware tunables" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2