am a9ac3a9d: Merge "Support debug info in dexmerge."

* commit 'a9ac3a9d1f8de71bcdc39d1f4827c04a952a0c29':
  Support debug info in dexmerge.

1 files changed, 8 insertions, 0 deletions

diff --git a/dx/src/com/android/dx/io/DexBuffer.java b/dx/src/com/android/dx/io/DexBuffer.java
index 2420cfd9f..39e5858e6 100644
--- a/dx/src/com/android/dx/io/DexBuffer.java
+++ b/dx/src/com/android/dx/io/DexBuffer.java
@@ -362,6 +362,10 @@ public final class DexBuffer {
             return Leb128Utils.readUnsignedLeb128(this);
         }
 
+        public int readUleb128p1() {
+            return Leb128Utils.readUnsignedLeb128(this) - 1;
+        }
+
         public int readSleb128() {
             return Leb128Utils.readSignedLeb128(this);
         }
@@ -611,6 +615,10 @@ public final class DexBuffer {
             }
         }
 
+        public void writeUleb128p1(int i) {
+            writeUleb128(i + 1);
+        }
+
         public void writeSleb128(int i) {
             try {
                 Leb128Utils.writeSignedLeb128(this, i);