merged phil and my android files