OSDN Git Service

am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerg...
authorYohann Roussel <yroussel@google.com>
Mon, 12 Nov 2012 20:07:44 +0000 (12:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:07:44 +0000 (12:07 -0800)
commitb6f4e0372154191bdf1ee32727aead1fe1200cbc
tree152f4e6a2a5321b923fb5a502b6d62bbdd515e42
parent437f58a5d25d76aa035c53e341e2516e39a70927
parentafe3a0131e75367759e1d7a69cec0aac2a45524c
am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

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