tree c3c3e380ed16676186040f1da6042fc2cd58e041
parent 3ce07dd1a1d000a5439e32d64fcee19268846c08
parent e42888f9df4163303244070c65d5229d3e201742
author Mathieu Chartier <mathieuc@google.com> 1461790270 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1461790270 +0000

Merge changes I38cbe315,Ia05cb31f

* changes:
  Write conflict tables in image
  Add support for eagerly calculating conflict tables