revert "Merge branch 'cm-10.2' of https://github.com/PAC-man/android into cm-10.2"