tree 03ccb6babf4e83a8b5f8b47453165c7865eadeed
parent 176040dda860d93b61286f35340e84972db0cdad
author Nicolas Geoffray <ngeoffray@google.com> 1441987574 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 1441987574 +0000

Revert "Fixes incorrect update of DexMerger.main"

Breaks libcore testing through vogar.

This reverts commit 176040dda860d93b61286f35340e84972db0cdad.

Change-Id: Ibd4e44148effb4ac212d58099fe84d71be040b9e