tree 768e9518db0f75312746958d1b9365b4eaf2e90a
parent 2b93554398f913b1e2310f3fff58fb520a973421
author Stephen Li <stephenli@google.com> 1505434135 +0000
committer Stephen Li <stephenli@google.com> 1505434135 +0000

Revert "Upstream +2 should not override merge conflict -2."

This reverts commit 2b93554398f913b1e2310f3fff58fb520a973421.

Going with a different strategy to deal with this problem.

Change-Id: I31c76282dd8a1e1cea403720a8818cfbd731268e