tree f4d7265c8e96375905da749f858672b37580e596
parent d23d7d145c86975acbcc75505b8a323337066ac0
author Mathieu Chartier <mathieuc@google.com> 1461861894 -0700
committer Mathieu Chartier <mathieuc@google.com> 1461881904 -0700

Revert "Revert "Write conflict tables in image""

Added test.

Bug: 27906566

This reverts commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6.

(cherry picked from commit cdca476bf3394ce9d97a369e84e701b427009318)

Change-Id: Ia94fc7acc7ae3879921c4e8d0a02b156037ac286