India and the U.S. resolved trade and tariff rows as New Delhi promised to buy more U.S. oil, gas, and military equipment.