tree 152f4e6a2a5321b923fb5a502b6d62bbdd515e42
parent ce0723cc425223c0e93ab0ce1968822c5ef9d352
parent b6f4e0372154191bdf1ee32727aead1fe1200cbc
author Yohann Roussel <yroussel@google.com> 1352751029 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352751029 -0800

am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'b6f4e0372154191bdf1ee32727aead1fe1200cbc':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."