| commit | b6f4e0372154191bdf1ee32727aead1fe1200cbc | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Mon Nov 12 12:07:44 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 12:07:44 2012 -0800 |
| tree | 152f4e6a2a5321b923fb5a502b6d62bbdd515e42 | |
| parent | 437f58a5d25d76aa035c53e341e2516e39a70927 [diff] | |
| parent | afe3a0131e75367759e1d7a69cec0aac2a45524c [diff] |
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."