OSDN Git Service

Revert "Fix alignment when recompacting a DexMerger result. do not merge."
authorYohann Roussel <yroussel@google.com>
Wed, 7 Nov 2012 10:03:30 +0000 (02:03 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Nov 2012 10:03:30 +0000 (02:03 -0800)
commit288f22800c8fe1eb44afff78ec1fff815379183e
tree7f6dcdf488f19101577ebbf281e99069e59fd2d2
parent707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6
Revert "Fix alignment when recompacting a DexMerger result. do not merge."

This reverts commit 707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6

Looks like jb-dev is missing some other patches before it possible to cherry-pick this one.

Change-Id: I8cbdd649d03696cb80be0dacc8640275468ef162
dx/src/com/android/dx/merge/DexMerger.java