cLock: Unicode formatting

Patch set 2: Fix authorship

Change-Id: I8b217a01cbf82eaf0c43df3f69b8a860ac87ce65
Merge "cLock: Unicode formatting" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1