Merge remote-tracking branch 'cm/cm-11.0' into kitkat
Merge pull request #4 from AOSPA-legacy/kitkat

Merge remote-tracking branch 'cm/cm-11.0' into kitkat