forgot the Ti badge
Merge branch 'android'