don't want to bump the android version until we finish fighting with Apple
Merge branch 'mrhines' into chat