tree bf2c99a6a3fe4f2b1a51fdcb89799e2cb918218e
parent 51801371a9b0f829303d326a2300518177dde3e8
author Elliott Hughes <enh@google.com> 1339112858 -0700
committer Xavier Ducrohet <xav@android.com> 1346373231 -0700

Support debug info in dexmerge. do not merge.

Bug: 4090053

Signed-off-by: Jesse Wilson <jesse@swank.ca>

(cherry picked from commit bc23c4f3ebaefebb3f1be7732767631f91e165ea)

Change-Id: Ic59d3cc1866c2e4328e406f22cb23fc08d5c6d91