OSDN Git Service

am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompact...
authorYohann Roussel <yroussel@google.com>
Mon, 12 Nov 2012 20:10:29 +0000 (12:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:10:29 +0000 (12:10 -0800)
commita3df5b58369667f2fb3c4616f7e175b6ec7db412
tree152f4e6a2a5321b923fb5a502b6d62bbdd515e42
parentce0723cc425223c0e93ab0ce1968822c5ef9d352
parentb6f4e0372154191bdf1ee32727aead1fe1200cbc
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."