Final working commit for android prototype v1