commit | cdca476bf3394ce9d97a369e84e701b427009318 | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Thu Apr 28 09:44:54 2016 -0700 |
committer | Mathieu Chartier <mathieuc@google.com> | Thu Apr 28 11:48:19 2016 -0700 |
tree | 255b537324a89554bf3d1078edf5eea5858cea37 | |
parent | ba20abcd1bf567bac34b82794c3630a0ca81be3d [diff] |
Revert "Revert "Write conflict tables in image"" Added test. Bug: 27906566 This reverts commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6. Change-Id: I0894f5f7cd11af29ed9d0345b51f527fc8a41d19