US, China take pains to cool military dispute