Bring in HTC One X for the TROLL
Merge pull request #1 from ProjectCodeKill/cm-10.2

Bring in HTC One X for the TROLL