Google Git
Sign in
android/platform/dalvik.git/refs/heads/jb-dev
commit
288f22800c8fe1eb44afff78ec1fff815379183e
[log]
author
Yohann Roussel <yroussel@google.com>
Wed Nov 07 02:03:30 2012 -0800
committer
Android (Google) Code Review <android-gerrit@google.com>
Wed Nov 07 02:03:30 2012 -0800
tree
7f6dcdf488f19101577ebbf281e99069e59fd2d2
parent
707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6 [diff]
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
1 file changed
tree: 7f6dcdf488f19101577ebbf281e99069e59fd2d2
  1. dalvikvm/
  2. dexdump/
  3. dexgen/
  4. dexlist/
  5. dexopt/
  6. docs/
  7. dvz/
  8. dx/
  9. hit/
  10. libdex/
  11. opcode-gen/
  12. tests/
  13. tools/
  14. unit-tests/
  15. vm/
  16. Android.mk
  17. CleanSpec.mk
  18. MODULE_LICENSE_APACHE2
  19. NOTICE
  20. README.txt