Fix derp.

Change-Id: I473684a9ec4763c33709d5f59a5403eff63ce97e
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1