OSDN Git Service

am f118a9fc: am a3df5b58: am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert...
authorYohann Roussel <yroussel@google.com>
Mon, 12 Nov 2012 20:16:36 +0000 (12:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:16:36 +0000 (12:16 -0800)
commitac0dce8c92f7001a906ebee19a773181373c0f61
tree36b366486002fa5fee1731c58be9125a4f5b7dc6
parente4df189b4db1024bb371cf210d4062c0df8d07b5
parentf118a9fce9f661406835d4e218db91b04bd923dc
am f118a9fc: am a3df5b58: am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'f118a9fce9f661406835d4e218db91b04bd923dc':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."