merged android stuff