enrc2b: CM11
Merge pull request #198 from HoxPlusCMOfficial/master

enrc2b: CM11
repopick: Update API for current gerrit version
Merge pull request #21 from CyanogenMod/master

Cm 11.0