Android branch - added files