tree 544c8882a02e6d08e9bca6c7b348744ce651a703
parent 62f2e24a96476794135feea15778b93d647861d5
author Stephen Li <stephenli@google.com> 1504894572 -0700
committer Stephen Li <stephenli@google.com> 1504917077 -0700

Upstream +2 should not override merge conflict -2.

Change-Id: Id870fe4706b1231befed1dea34a7b618e2ecc0c1