3.5 beta

Fixes for KitKat