tree a62d4397dd54fa1ee65ce870e3c0b0b965f43868
parent 85e47976a483844177eb486d6e501fa070fbe6e2
author Mathieu Chartier <mathieuc@google.com> 1461791022 +0000
committer Mathieu Chartier <mathieuc@google.com> 1461881890 -0700

Revert "Write conflict tables in image"

Some strange issues on angler.

This reverts commit cda9386add68d94697449c6cb08b356747e55c21.

(cherry picked from commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6)

Change-Id: Iffd25c5fb732ff72b58c787c107dc33c56f8c8d4