From: yroussel <yroussel@google.com>
Date: Mon, 12 Nov 2012 20:16:35 +0000 (-0800)
Subject: am 96cdc4ca: am ce0723cc: am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignm... 
X-Git-Tag: android-x86-4.4-r1~168^2~43
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e4df189b;p=android-x86%2Fdalvik.git

am 96cdc4ca: am ce0723cc: am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '96cdc4cacdae25302cb5ec79e43063140411cbb7':
  Fix alignment when recompacting a DexMerger result. do not merge.
---

e4df189b4db1024bb371cf210d4062c0df8d07b5