Microsoft, Google End Regulatory Disputes