tree b55804542510f8592c1c5b9e522a16d35567b2f1
parent 54c42cea2b73e664c36fc4efaa28a33aea39b97c
parent adc9086aac1f9442f5ec80cec5734909f0b0f262
author Mathieu Chartier <mathieuc@google.com> 1526082531 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1526082531 +0000

Merge "Revert "Revert "Do not load app image for class collisions"""