tree ec74da146d809e87b388d8d8a1c5241d4dab694c
parent 3920099f578fd8015777bc3c1c7392a08b1e08e7
author Nicolas Geoffray <ngeoffray@google.com> 1458750951 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 1458750951 +0000

Fix dex2oat/oatdump cross-compilation.

Only set the ImtConflictTable when not in AOT, to not mess up
with the image.

Change-Id: I8f2926ad30dc913d61b0c8957affc25fc8056ada