Merge branch 'cm-12.0-ak' of https://github.com/anarkia1976/AK-OnePone into cm-12.0-qx