Landmark China-Japan deal agreed