tree 657ae722cc48116d2f5e8b0ea30378068963cea6
parent 6807ad27d137b73b3fafa30d8f99c16600a1b5fa
parent b5678a492a03ff630263bb3922b75690cc76361e
author Ethan Chen <intervigil@gmail.com> 1383364857 +0000
committer Gerrit Code Review <gerrit@cyanogenmod.org> 1383364857 +0000

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