OSDN Git Service

am a9ac3a9d: Merge "Support debug info in dexmerge."
authorElliott Hughes <enh@google.com>
Tue, 12 Jun 2012 00:43:13 +0000 (17:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Jun 2012 00:43:13 +0000 (17:43 -0700)
commit5164762f98362866f50cda3c7f2b72b519be9c91
tree90351878d1f7e62ee0d7f0ea2086b854874fb78c
parentc3cd242005fb31035265d0bbd5681518eea656b4
parenta9ac3a9d1f8de71bcdc39d1f4827c04a952a0c29
am a9ac3a9d: Merge "Support debug info in dexmerge."

* commit 'a9ac3a9d1f8de71bcdc39d1f4827c04a952a0c29':
  Support debug info in dexmerge.
dx/src/com/android/dx/io/DexBuffer.java
dx/src/com/android/dx/merge/DexMerger.java