android port
merge