Commiting Code for Androd support