master: s-0updated android proj