OSDN Git Service

am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger resul...
authoryroussel <yroussel@google.com>
Mon, 12 Nov 2012 20:07:43 +0000 (12:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:07:43 +0000 (12:07 -0800)
commit437f58a5d25d76aa035c53e341e2516e39a70927
tree152f4e6a2a5321b923fb5a502b6d62bbdd515e42
parentf870f2dce9300c8dec620613371f08e5c234245b
parent2d2f13c50ba3c38dc4a8a8aaf483f6df155e0080
am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '2d2f13c50ba3c38dc4a8a8aaf483f6df155e0080':
  Fix alignment when recompacting a DexMerger result. do not merge.