Germany and China united in trade?

The US threats of a trade war loomed over Angela Merkel's meeting with the Chinese premier in Berlin. But can rallying around a common economic foe push concerns over protective business practices?