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