a
Merge branch 'cm-11.0' of https://github.com/jwhitson1976/android into cm-11.0