tree b1801f7cb1e5f59b547ea7c7535269c0990e6788
parent df244ae85f911408978b161e50b1bca18f09283b
parent dd0898e54fb76a7181eef4d6267dd6e5a0e9f999
author Nicolas Geoffray <ngeoffray@google.com> 1442009639 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442009639 +0000

am dd0898e5: Merge "Revert "Fixes incorrect update of DexMerger.main""

* commit 'dd0898e54fb76a7181eef4d6267dd6e5a0e9f999':
  Revert "Fixes incorrect update of DexMerger.main"