tree 79e6a73360e73838e6cbde21cc0000c4a732c904
parent 486728d82e5b36a5ff3d40d282d9c32f7305bc3a
author Andreas Gampe <agampe@google.com> 1436401377 -0700
committer Andreas Gampe <agampe@google.com> 1436404146 -0700

ART: Allow to set and copy conflicts in the verifier

As long as conflicts are not actively being used, it is OK to set
them in a register line or copy them around.

Bug: 22331663
Change-Id: I61999e2d9c92f9bdedcb0a5dea54df3c5bb130ca