Merge "Add HTC One X contributors" into cm-10.2