First commit on Android branch