Merge pull request #1 from Mkey-Android/cm11

merge from Mkey-Android