Final code checkin -- Android App code