Merge "*libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev"

1 files changed, 8 insertions, 0 deletions

diff --git a/dex/src/main/java/com/android/dex/Dex.java b/dex/src/main/java/com/android/dex/Dex.java
index b1ddc0a72..e6bee6847 100644
--- a/dex/src/main/java/com/android/dex/Dex.java
+++ b/dex/src/main/java/com/android/dex/Dex.java
@@ -458,10 +458,18 @@ public final class Dex {
             return Leb128.readUnsignedLeb128(this);
         }
 
+        public int readUleb128p1() {
+            return Leb128.readUnsignedLeb128(this) - 1;
+        }
+
         public int readSleb128() {
             return Leb128.readSignedLeb128(this);
         }
 
+        public void writeUleb128p1(int i) {
+            writeUleb128(i + 1);
+        }
+
         public TypeList readTypeList() {
             int size = readInt();
             short[] types = new short[size];