tree aa0ee73271b360474d3f959b728dbee62066ef4f
parent e4d442c6d6f35d45414f4b595029555585b14040
author Stephen Li <stephenli@google.com> 1486408582 -0800
committer Stephen Li <stephenli@google.com> 1486408847 -0800

Force merge strategy recursive.

Change-Id: I3a4f4dadfd5a6776db21f0a88d49cd5381cac2c1