China-U.S. differences were on display, but both leaders also expressed a commitment to keeping tensions from erupting into conflict.

This post was originally published on The Diplomat.