tree 34120cee962a41ad4ad2eca9ddb13ba0aaabffc5
parent 03481dea9ebb2fa93d1e31a9cb8e0b6f99052a68
parent de38b797c3e5ba3ee44c480db7093386975c51eb
author Nicolas Geoffray <ngeoffray@google.com> 1451487040 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1451487040 +0000

Merge "Revert "ART: Fix up some multi-image cases""