tree 60d2cf9183ba3d805b0e610202d15836f6c69787
parent ee41484147b1fc8628aa2acee3a636d48dbda84a
parent 52c11202022ff327492e1dc6d6d60e32fc1ff39d
author Andreas Gampe <agampe@google.com> 1441941692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441941692 +0000

am 52c11202: Merge "Fixes incorrect update of DexMerger.main"

* commit '52c11202022ff327492e1dc6d6d60e32fc1ff39d':
  Fixes incorrect update of DexMerger.main