From: Brian Carlstrom <bdc@google.com>
Date: Sat, 4 May 2013 21:22:09 +0000 (-0700)
Subject: am e30d296d: am ac653462: Merge "Fix alignment when recompacting a DexMerger result."
X-Git-Tag: android-x86-4.4-r1~80
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8f383105810d36ea18cebda1c7b15d8eca20b268;p=android-x86%2Fdalvik.git

am e30d296d: am ac653462: Merge "Fix alignment when recompacting a DexMerger result."

* commit 'e30d296d0c3c1c6728129380302cd84e0a4301bd':
  Fix alignment when recompacting a DexMerger result.
---

8f383105810d36ea18cebda1c7b15d8eca20b268