initial commit of Android branch