Restructure files to match upstream structure for v1.3

This is in preparation for upgrading to v1.3 as part of the
work to upgrade mockito to 1.10.19.

src/main -> dexmaker/src/main
src/test -> dexmaker/src/test
src/dx -> dx/src/main
src/mockito -> mockito/src/main

The README is moved to README.google to be consistent with other
open source based projects in AOSP.

Also updates the patch files and instructions on how to use
them.

Bug: 30299479
Test: Build and run some mockito based tests.
Change-Id: I2d80acc1e117a26e55dc8c4522eb9bc79f3852cc

297 files changed, 11 insertions, 11 deletions

diff --git a/Android.mk b/Android.mk
index 7314e6f..f3eb828 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java src/dx/java)
+LOCAL_SRC_FILES := $(call all-java-files-under, dexmaker/src/main/java dx/src/main/java)
 
 LOCAL_SDK_VERSION := 10
 
@@ -30,7 +30,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := dexmaker-mockmaker
 LOCAL_SDK_VERSION := 10
-LOCAL_SRC_FILES := $(call all-java-files-under, src/mockito/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/mockito/resources
+LOCAL_SRC_FILES := $(call all-java-files-under, mockito/src/main/java)
+LOCAL_JAVA_RESOURCE_DIRS := mockito/src/main/resources
 LOCAL_JAVA_LIBRARIES := dexmaker mockito-api
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/README b/README.android
index 74fd815..22da577 100644
--- a/README
+++ b/README.android
@@ -19,6 +19,6 @@ bug-8108255.patch: temporary workaround to ClassLoading issues
 bug-10862083.patch: Do not assert that InvocationHandler.invoke args should be non-null
     (see https://code.google.com/p/dexmaker/issues/detail?id=27)
 
-to apply, run 'patch -p0 < bug-xyz.patch' from a fresh src
-to remove, use 'patch -p0 -R < bug-xyz.patch'
+to apply, run 'patch -p1 < bug-xyz.patch' from a fresh src
+to remove, use 'patch -p1 -R < bug-xyz.patch'
 
diff --git a/bug-10862083.patch b/bug-10862083.patch
index 0dec4c3..06d5b92 100644
--- a/bug-10862083.patch
+++ b/bug-10862083.patch
@@ -1,7 +1,7 @@
-diff --git a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
+diff --git a/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java b/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
 index 268f2fd..2775a63 100644
---- a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
-+++ b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
+--- a/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
++++ b/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
 @@ -45,11 +45,6 @@ final class InvocationHandlerAdapter implements InvocationHandler {
              return System.identityHashCode(proxy);
          }
diff --git a/bug-8108255.patch b/bug-8108255.patch
index 6e1566d..bdccc8e 100644
--- a/bug-8108255.patch
+++ b/bug-8108255.patch
@@ -1,6 +1,6 @@
-diff -ur src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java patched_src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
---- src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java	2013-01-07 11:27:13.000000000 -0800
-+++ patched_src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java	2013-02-15 11:27:44.000000000 -0800
+diff -ur a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
+--- a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java	2013-01-07 11:27:13.000000000 -0800
++++ b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java	2013-02-15 11:27:44.000000000 -0800
 @@ -45,9 +45,10 @@
              Class[] classesToMock = new Class[extraInterfaces.length + 1];
              classesToMock[0] = typeToMock;
diff --git a/src/main/java/com/google/dexmaker/AppDataDirGuesser.java b/dexmaker/src/main/java/com/google/dexmaker/AppDataDirGuesser.java
index 4479887..4479887 100644
--- a/src/main/java/com/google/dexmaker/AppDataDirGuesser.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/AppDataDirGuesser.java
diff --git a/src/main/java/com/google/dexmaker/BinaryOp.java b/dexmaker/src/main/java/com/google/dexmaker/BinaryOp.java
index 04734cf..04734cf 100644
--- a/src/main/java/com/google/dexmaker/BinaryOp.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/BinaryOp.java
diff --git a/src/main/java/com/google/dexmaker/Code.java b/dexmaker/src/main/java/com/google/dexmaker/Code.java
index 54409a5..54409a5 100644
--- a/src/main/java/com/google/dexmaker/Code.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Code.java
diff --git a/src/main/java/com/google/dexmaker/Comparison.java b/dexmaker/src/main/java/com/google/dexmaker/Comparison.java
index 06e3ca3..06e3ca3 100644
--- a/src/main/java/com/google/dexmaker/Comparison.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Comparison.java
diff --git a/src/main/java/com/google/dexmaker/Constants.java b/dexmaker/src/main/java/com/google/dexmaker/Constants.java
index ec21cb8..ec21cb8 100644
--- a/src/main/java/com/google/dexmaker/Constants.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Constants.java
diff --git a/src/main/java/com/google/dexmaker/DexMaker.java b/dexmaker/src/main/java/com/google/dexmaker/DexMaker.java
index 4e67433..4e67433 100644
--- a/src/main/java/com/google/dexmaker/DexMaker.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/DexMaker.java
diff --git a/src/main/java/com/google/dexmaker/FieldId.java b/dexmaker/src/main/java/com/google/dexmaker/FieldId.java
index c03e1d1..c03e1d1 100644
--- a/src/main/java/com/google/dexmaker/FieldId.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/FieldId.java
diff --git a/src/main/java/com/google/dexmaker/Label.java b/dexmaker/src/main/java/com/google/dexmaker/Label.java
index b37b18c..b37b18c 100644
--- a/src/main/java/com/google/dexmaker/Label.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Label.java
diff --git a/src/main/java/com/google/dexmaker/Local.java b/dexmaker/src/main/java/com/google/dexmaker/Local.java
index c89436d..c89436d 100644
--- a/src/main/java/com/google/dexmaker/Local.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Local.java
diff --git a/src/main/java/com/google/dexmaker/MethodId.java b/dexmaker/src/main/java/com/google/dexmaker/MethodId.java
index a43060c..a43060c 100644
--- a/src/main/java/com/google/dexmaker/MethodId.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/MethodId.java
diff --git a/src/main/java/com/google/dexmaker/TypeId.java b/dexmaker/src/main/java/com/google/dexmaker/TypeId.java
index 36e0b5a..36e0b5a 100644
--- a/src/main/java/com/google/dexmaker/TypeId.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/TypeId.java
diff --git a/src/main/java/com/google/dexmaker/TypeList.java b/dexmaker/src/main/java/com/google/dexmaker/TypeList.java
index 688157f..688157f 100644
--- a/src/main/java/com/google/dexmaker/TypeList.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/TypeList.java
diff --git a/src/main/java/com/google/dexmaker/UnaryOp.java b/dexmaker/src/main/java/com/google/dexmaker/UnaryOp.java
index cf565bb..cf565bb 100644
--- a/src/main/java/com/google/dexmaker/UnaryOp.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/UnaryOp.java
diff --git a/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java b/dexmaker/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java
index aa59886..aa59886 100644
--- a/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java
diff --git a/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java b/dexmaker/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java
index b638509..b638509 100644
--- a/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java
diff --git a/src/test/java/com/google/dexmaker/DexMakerTest.java b/dexmaker/src/test/java/com/google/dexmaker/DexMakerTest.java
index 2b7a27b..2b7a27b 100644
--- a/src/test/java/com/google/dexmaker/DexMakerTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/DexMakerTest.java
diff --git a/src/test/java/com/google/dexmaker/TypeIdTest.java b/dexmaker/src/test/java/com/google/dexmaker/TypeIdTest.java
index 26e8413..26e8413 100644
--- a/src/test/java/com/google/dexmaker/TypeIdTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/TypeIdTest.java
diff --git a/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java b/dexmaker/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
index ced3d53..ced3d53 100644
--- a/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
diff --git a/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java b/dexmaker/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java
index 40dd1aa..40dd1aa 100644
--- a/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java
diff --git a/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java b/dexmaker/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java
index 763d740..763d740 100644
--- a/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java
diff --git a/src/dx/java/com/android/dx/Version.java b/dx/src/main/java/com/android/dx/Version.java
index 130025a..130025a 100644
--- a/src/dx/java/com/android/dx/Version.java
+++ b/dx/src/main/java/com/android/dx/Version.java
diff --git a/src/dx/java/com/android/dx/cf/code/Merger.java b/dx/src/main/java/com/android/dx/cf/code/Merger.java
index cce3f25..cce3f25 100644
--- a/src/dx/java/com/android/dx/cf/code/Merger.java
+++ b/dx/src/main/java/com/android/dx/cf/code/Merger.java
diff --git a/src/dx/java/com/android/dx/dex/DexFormat.java b/dx/src/main/java/com/android/dx/dex/DexFormat.java
index 3543b35..3543b35 100644
--- a/src/dx/java/com/android/dx/dex/DexFormat.java
+++ b/dx/src/main/java/com/android/dx/dex/DexFormat.java
diff --git a/src/dx/java/com/android/dx/dex/DexOptions.java b/dx/src/main/java/com/android/dx/dex/DexOptions.java
index 0357384..0357384 100644
--- a/src/dx/java/com/android/dx/dex/DexOptions.java
+++ b/dx/src/main/java/com/android/dx/dex/DexOptions.java
diff --git a/src/dx/java/com/android/dx/dex/SizeOf.java b/dx/src/main/java/com/android/dx/dex/SizeOf.java
index 476f7bb..476f7bb 100644
--- a/src/dx/java/com/android/dx/dex/SizeOf.java
+++ b/dx/src/main/java/com/android/dx/dex/SizeOf.java
diff --git a/src/dx/java/com/android/dx/dex/code/ArrayData.java b/dx/src/main/java/com/android/dx/dex/code/ArrayData.java
index 6674b75..6674b75 100644
--- a/src/dx/java/com/android/dx/dex/code/ArrayData.java
+++ b/dx/src/main/java/com/android/dx/dex/code/ArrayData.java
diff --git a/src/dx/java/com/android/dx/dex/code/BlockAddresses.java b/dx/src/main/java/com/android/dx/dex/code/BlockAddresses.java
index 1a1d184..1a1d184 100644
--- a/src/dx/java/com/android/dx/dex/code/BlockAddresses.java
+++ b/dx/src/main/java/com/android/dx/dex/code/BlockAddresses.java
diff --git a/src/dx/java/com/android/dx/dex/code/CatchBuilder.java b/dx/src/main/java/com/android/dx/dex/code/CatchBuilder.java
index 90d2e8d..90d2e8d 100644
--- a/src/dx/java/com/android/dx/dex/code/CatchBuilder.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CatchBuilder.java
diff --git a/src/dx/java/com/android/dx/dex/code/CatchHandlerList.java b/dx/src/main/java/com/android/dx/dex/code/CatchHandlerList.java
index 8472584..8472584 100644
--- a/src/dx/java/com/android/dx/dex/code/CatchHandlerList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CatchHandlerList.java
diff --git a/src/dx/java/com/android/dx/dex/code/CatchTable.java b/dx/src/main/java/com/android/dx/dex/code/CatchTable.java
index 0ee890f..0ee890f 100644
--- a/src/dx/java/com/android/dx/dex/code/CatchTable.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CatchTable.java
diff --git a/src/dx/java/com/android/dx/dex/code/CodeAddress.java b/dx/src/main/java/com/android/dx/dex/code/CodeAddress.java
index 5d26bd1..5d26bd1 100644
--- a/src/dx/java/com/android/dx/dex/code/CodeAddress.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CodeAddress.java
diff --git a/src/dx/java/com/android/dx/dex/code/CstInsn.java b/dx/src/main/java/com/android/dx/dex/code/CstInsn.java
index 3f848c0..3f848c0 100644
--- a/src/dx/java/com/android/dx/dex/code/CstInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CstInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/DalvCode.java b/dx/src/main/java/com/android/dx/dex/code/DalvCode.java
index 58f191b..58f191b 100644
--- a/src/dx/java/com/android/dx/dex/code/DalvCode.java
+++ b/dx/src/main/java/com/android/dx/dex/code/DalvCode.java
diff --git a/src/dx/java/com/android/dx/dex/code/DalvInsn.java b/dx/src/main/java/com/android/dx/dex/code/DalvInsn.java
index d0cf395..d0cf395 100644
--- a/src/dx/java/com/android/dx/dex/code/DalvInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/DalvInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/DalvInsnList.java b/dx/src/main/java/com/android/dx/dex/code/DalvInsnList.java
index e856cb4..e856cb4 100644
--- a/src/dx/java/com/android/dx/dex/code/DalvInsnList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/DalvInsnList.java
diff --git a/src/dx/java/com/android/dx/dex/code/Dop.java b/dx/src/main/java/com/android/dx/dex/code/Dop.java
index 51d1b51..51d1b51 100644
--- a/src/dx/java/com/android/dx/dex/code/Dop.java
+++ b/dx/src/main/java/com/android/dx/dex/code/Dop.java
diff --git a/src/dx/java/com/android/dx/dex/code/Dops.java b/dx/src/main/java/com/android/dx/dex/code/Dops.java
index c066252..c066252 100644
--- a/src/dx/java/com/android/dx/dex/code/Dops.java
+++ b/dx/src/main/java/com/android/dx/dex/code/Dops.java
diff --git a/src/dx/java/com/android/dx/dex/code/FixedSizeInsn.java b/dx/src/main/java/com/android/dx/dex/code/FixedSizeInsn.java
index faed530..faed530 100644
--- a/src/dx/java/com/android/dx/dex/code/FixedSizeInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/FixedSizeInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/HighRegisterPrefix.java b/dx/src/main/java/com/android/dx/dex/code/HighRegisterPrefix.java
index 6fab094..6fab094 100644
--- a/src/dx/java/com/android/dx/dex/code/HighRegisterPrefix.java
+++ b/dx/src/main/java/com/android/dx/dex/code/HighRegisterPrefix.java
diff --git a/src/dx/java/com/android/dx/dex/code/InsnFormat.java b/dx/src/main/java/com/android/dx/dex/code/InsnFormat.java
index bf9f08e..bf9f08e 100644
--- a/src/dx/java/com/android/dx/dex/code/InsnFormat.java
+++ b/dx/src/main/java/com/android/dx/dex/code/InsnFormat.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalEnd.java b/dx/src/main/java/com/android/dx/dex/code/LocalEnd.java
index 1c2bf89..1c2bf89 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalEnd.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalEnd.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalList.java b/dx/src/main/java/com/android/dx/dex/code/LocalList.java
index ab8343a..ab8343a 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalList.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalSnapshot.java b/dx/src/main/java/com/android/dx/dex/code/LocalSnapshot.java
index baeab4c..baeab4c 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalSnapshot.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalSnapshot.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalStart.java b/dx/src/main/java/com/android/dx/dex/code/LocalStart.java
index 9a17c5b..9a17c5b 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalStart.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalStart.java
diff --git a/src/dx/java/com/android/dx/dex/code/OddSpacer.java b/dx/src/main/java/com/android/dx/dex/code/OddSpacer.java
index f44f9cc..f44f9cc 100644
--- a/src/dx/java/com/android/dx/dex/code/OddSpacer.java
+++ b/dx/src/main/java/com/android/dx/dex/code/OddSpacer.java
diff --git a/src/dx/java/com/android/dx/dex/code/OutputCollector.java b/dx/src/main/java/com/android/dx/dex/code/OutputCollector.java
index a5e54a8..a5e54a8 100644
--- a/src/dx/java/com/android/dx/dex/code/OutputCollector.java
+++ b/dx/src/main/java/com/android/dx/dex/code/OutputCollector.java
diff --git a/src/dx/java/com/android/dx/dex/code/OutputFinisher.java b/dx/src/main/java/com/android/dx/dex/code/OutputFinisher.java
index 19b5634..19b5634 100644
--- a/src/dx/java/com/android/dx/dex/code/OutputFinisher.java
+++ b/dx/src/main/java/com/android/dx/dex/code/OutputFinisher.java
diff --git a/src/dx/java/com/android/dx/dex/code/PositionList.java b/dx/src/main/java/com/android/dx/dex/code/PositionList.java
index 1e07e46..1e07e46 100644
--- a/src/dx/java/com/android/dx/dex/code/PositionList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/PositionList.java
diff --git a/src/dx/java/com/android/dx/dex/code/RopToDop.java b/dx/src/main/java/com/android/dx/dex/code/RopToDop.java
index 0330113..0330113 100644
--- a/src/dx/java/com/android/dx/dex/code/RopToDop.java
+++ b/dx/src/main/java/com/android/dx/dex/code/RopToDop.java
diff --git a/src/dx/java/com/android/dx/dex/code/RopTranslator.java b/dx/src/main/java/com/android/dx/dex/code/RopTranslator.java
index 3d24c4f..3d24c4f 100644
--- a/src/dx/java/com/android/dx/dex/code/RopTranslator.java
+++ b/dx/src/main/java/com/android/dx/dex/code/RopTranslator.java
diff --git a/src/dx/java/com/android/dx/dex/code/SimpleInsn.java b/dx/src/main/java/com/android/dx/dex/code/SimpleInsn.java
index 8cdcc55..8cdcc55 100644
--- a/src/dx/java/com/android/dx/dex/code/SimpleInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/SimpleInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/StdCatchBuilder.java b/dx/src/main/java/com/android/dx/dex/code/StdCatchBuilder.java
index 1e7612e..1e7612e 100644
--- a/src/dx/java/com/android/dx/dex/code/StdCatchBuilder.java
+++ b/dx/src/main/java/com/android/dx/dex/code/StdCatchBuilder.java
diff --git a/src/dx/java/com/android/dx/dex/code/SwitchData.java b/dx/src/main/java/com/android/dx/dex/code/SwitchData.java
index 8fc80b1..8fc80b1 100644
--- a/src/dx/java/com/android/dx/dex/code/SwitchData.java
+++ b/dx/src/main/java/com/android/dx/dex/code/SwitchData.java
diff --git a/src/dx/java/com/android/dx/dex/code/TargetInsn.java b/dx/src/main/java/com/android/dx/dex/code/TargetInsn.java
index cbb5ff9..cbb5ff9 100644
--- a/src/dx/java/com/android/dx/dex/code/TargetInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/TargetInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/VariableSizeInsn.java b/dx/src/main/java/com/android/dx/dex/code/VariableSizeInsn.java
index 06b40f7..06b40f7 100644
--- a/src/dx/java/com/android/dx/dex/code/VariableSizeInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/VariableSizeInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/ZeroSizeInsn.java b/dx/src/main/java/com/android/dx/dex/code/ZeroSizeInsn.java
index 2cc157b..2cc157b 100644
--- a/src/dx/java/com/android/dx/dex/code/ZeroSizeInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/ZeroSizeInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form10t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form10t.java
index ced4a64..ced4a64 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form10t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form10t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form10x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form10x.java
index 4be3aa0..4be3aa0 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form10x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form10x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form11n.java b/dx/src/main/java/com/android/dx/dex/code/form/Form11n.java
index 479af6e..479af6e 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form11n.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form11n.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form11x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form11x.java
index 82dda65..82dda65 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form11x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form11x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form12x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form12x.java
index aabab8a..aabab8a 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form12x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form12x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form20t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form20t.java
index a19ed28..a19ed28 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form20t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form20t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21c.java
index 0335dc7..0335dc7 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21h.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21h.java
index 02cc0fd..02cc0fd 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21h.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21h.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21s.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21s.java
index 9264ec0..9264ec0 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21s.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21s.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21t.java
index 8adb668..8adb668 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22b.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22b.java
index e5a8b5d..e5a8b5d 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22b.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22b.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22c.java
index 5ffdb86..5ffdb86 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22s.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22s.java
index 03d180a..03d180a 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22s.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22s.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22t.java
index 15ce0f8..15ce0f8 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22x.java
index 01eec0b..01eec0b 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form23x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form23x.java
index 9164482..9164482 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form23x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form23x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form30t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form30t.java
index 86a3e82..86a3e82 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form30t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form30t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form31c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form31c.java
index 3295fda..3295fda 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form31c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form31c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form31i.java b/dx/src/main/java/com/android/dx/dex/code/form/Form31i.java
index b52341d..b52341d 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form31i.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form31i.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form31t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form31t.java
index 1999bba..1999bba 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form31t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form31t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form32s.java b/dx/src/main/java/com/android/dx/dex/code/form/Form32s.java
index e081470..e081470 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form32s.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form32s.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form32x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form32x.java
index abed0e9..abed0e9 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form32x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form32x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form33x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form33x.java
index 9a569a0..9a569a0 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form33x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form33x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form35c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form35c.java
index b9c12c6..b9c12c6 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form35c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form35c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form3rc.java b/dx/src/main/java/com/android/dx/dex/code/form/Form3rc.java
index 1727af5..1727af5 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form3rc.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form3rc.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form41c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form41c.java
index 24067bc..24067bc 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form41c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form41c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form51l.java b/dx/src/main/java/com/android/dx/dex/code/form/Form51l.java
index 4dc7bcd..4dc7bcd 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form51l.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form51l.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form52c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form52c.java
index acd2124..acd2124 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form52c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form52c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form5rc.java b/dx/src/main/java/com/android/dx/dex/code/form/Form5rc.java
index 0c54702..0c54702 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form5rc.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form5rc.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/SpecialFormat.java b/dx/src/main/java/com/android/dx/dex/code/form/SpecialFormat.java
index 87091b5..87091b5 100644
--- a/src/dx/java/com/android/dx/dex/code/form/SpecialFormat.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/SpecialFormat.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationItem.java
index 1d92247..1d92247 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationSetItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetItem.java
index 2187700..2187700 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationSetItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationSetRefItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetRefItem.java
index 53072d8..53072d8 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationSetRefItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetRefItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationUtils.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationUtils.java
index 350ed9a..350ed9a 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationUtils.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationUtils.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java
index 972d4e6..972d4e6 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/CatchStructs.java b/dx/src/main/java/com/android/dx/dex/file/CatchStructs.java
index 8b0f1bd..8b0f1bd 100644
--- a/src/dx/java/com/android/dx/dex/file/CatchStructs.java
+++ b/dx/src/main/java/com/android/dx/dex/file/CatchStructs.java
diff --git a/src/dx/java/com/android/dx/dex/file/ClassDataItem.java b/dx/src/main/java/com/android/dx/dex/file/ClassDataItem.java
index e9ae18b..e9ae18b 100644
--- a/src/dx/java/com/android/dx/dex/file/ClassDataItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ClassDataItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ClassDefItem.java b/dx/src/main/java/com/android/dx/dex/file/ClassDefItem.java
index df3945a..df3945a 100644
--- a/src/dx/java/com/android/dx/dex/file/ClassDefItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ClassDefItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ClassDefsSection.java b/dx/src/main/java/com/android/dx/dex/file/ClassDefsSection.java
index 1ca391f..1ca391f 100644
--- a/src/dx/java/com/android/dx/dex/file/ClassDefsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ClassDefsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/CodeItem.java b/dx/src/main/java/com/android/dx/dex/file/CodeItem.java
index a47f68a..a47f68a 100644
--- a/src/dx/java/com/android/dx/dex/file/CodeItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/CodeItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoConstants.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoConstants.java
index 78b6b04..78b6b04 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoConstants.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoConstants.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoDecoder.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoDecoder.java
index 9fb4845..9fb4845 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoDecoder.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoDecoder.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoEncoder.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoEncoder.java
index ae87fc3..ae87fc3 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoEncoder.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoEncoder.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoItem.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoItem.java
index 09b2712..09b2712 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/DexFile.java b/dx/src/main/java/com/android/dx/dex/file/DexFile.java
index 6a9882c..6a9882c 100644
--- a/src/dx/java/com/android/dx/dex/file/DexFile.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DexFile.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedArrayItem.java b/dx/src/main/java/com/android/dx/dex/file/EncodedArrayItem.java
index 3d05ab3..3d05ab3 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedArrayItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedArrayItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedField.java b/dx/src/main/java/com/android/dx/dex/file/EncodedField.java
index fdfa5d2..fdfa5d2 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedField.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedField.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedMember.java b/dx/src/main/java/com/android/dx/dex/file/EncodedMember.java
index 6277646..6277646 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedMember.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedMember.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedMethod.java b/dx/src/main/java/com/android/dx/dex/file/EncodedMethod.java
index c3f71b7..c3f71b7 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedMethod.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedMethod.java
diff --git a/src/dx/java/com/android/dx/dex/file/FieldAnnotationStruct.java b/dx/src/main/java/com/android/dx/dex/file/FieldAnnotationStruct.java
index f363d41..f363d41 100644
--- a/src/dx/java/com/android/dx/dex/file/FieldAnnotationStruct.java
+++ b/dx/src/main/java/com/android/dx/dex/file/FieldAnnotationStruct.java
diff --git a/src/dx/java/com/android/dx/dex/file/FieldIdItem.java b/dx/src/main/java/com/android/dx/dex/file/FieldIdItem.java
index ecb1d3d..ecb1d3d 100644
--- a/src/dx/java/com/android/dx/dex/file/FieldIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/FieldIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/FieldIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/FieldIdsSection.java
index c320731..c320731 100644
--- a/src/dx/java/com/android/dx/dex/file/FieldIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/FieldIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/HeaderItem.java b/dx/src/main/java/com/android/dx/dex/file/HeaderItem.java
index 3816eb8..3816eb8 100644
--- a/src/dx/java/com/android/dx/dex/file/HeaderItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/HeaderItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/HeaderSection.java b/dx/src/main/java/com/android/dx/dex/file/HeaderSection.java
index 21da488..21da488 100644
--- a/src/dx/java/com/android/dx/dex/file/HeaderSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/HeaderSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/IdItem.java b/dx/src/main/java/com/android/dx/dex/file/IdItem.java
index 1bd2b5f..1bd2b5f 100644
--- a/src/dx/java/com/android/dx/dex/file/IdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/IdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/IndexedItem.java b/dx/src/main/java/com/android/dx/dex/file/IndexedItem.java
index 9ba4783..9ba4783 100644
--- a/src/dx/java/com/android/dx/dex/file/IndexedItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/IndexedItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/Item.java b/dx/src/main/java/com/android/dx/dex/file/Item.java
index cf2b380..cf2b380 100644
--- a/src/dx/java/com/android/dx/dex/file/Item.java
+++ b/dx/src/main/java/com/android/dx/dex/file/Item.java
diff --git a/src/dx/java/com/android/dx/dex/file/ItemType.java b/dx/src/main/java/com/android/dx/dex/file/ItemType.java
index 2fe97ab..2fe97ab 100644
--- a/src/dx/java/com/android/dx/dex/file/ItemType.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ItemType.java
diff --git a/src/dx/java/com/android/dx/dex/file/MapItem.java b/dx/src/main/java/com/android/dx/dex/file/MapItem.java
index d78dc91..d78dc91 100644
--- a/src/dx/java/com/android/dx/dex/file/MapItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MapItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/MemberIdItem.java b/dx/src/main/java/com/android/dx/dex/file/MemberIdItem.java
index 08a3123..08a3123 100644
--- a/src/dx/java/com/android/dx/dex/file/MemberIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MemberIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/MemberIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/MemberIdsSection.java
index ec39b75..ec39b75 100644
--- a/src/dx/java/com/android/dx/dex/file/MemberIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MemberIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/MethodAnnotationStruct.java b/dx/src/main/java/com/android/dx/dex/file/MethodAnnotationStruct.java
index 38f7ce4..38f7ce4 100644
--- a/src/dx/java/com/android/dx/dex/file/MethodAnnotationStruct.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MethodAnnotationStruct.java
diff --git a/src/dx/java/com/android/dx/dex/file/MethodIdItem.java b/dx/src/main/java/com/android/dx/dex/file/MethodIdItem.java
index f2ff4f9..f2ff4f9 100644
--- a/src/dx/java/com/android/dx/dex/file/MethodIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MethodIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/MethodIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/MethodIdsSection.java
index fa0cd3c..fa0cd3c 100644
--- a/src/dx/java/com/android/dx/dex/file/MethodIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MethodIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/MixedItemSection.java b/dx/src/main/java/com/android/dx/dex/file/MixedItemSection.java
index b885306..b885306 100644
--- a/src/dx/java/com/android/dx/dex/file/MixedItemSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MixedItemSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/OffsettedItem.java b/dx/src/main/java/com/android/dx/dex/file/OffsettedItem.java
index 7721470..7721470 100644
--- a/src/dx/java/com/android/dx/dex/file/OffsettedItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/OffsettedItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ParameterAnnotationStruct.java b/dx/src/main/java/com/android/dx/dex/file/ParameterAnnotationStruct.java
index 078c219..078c219 100644
--- a/src/dx/java/com/android/dx/dex/file/ParameterAnnotationStruct.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ParameterAnnotationStruct.java
diff --git a/src/dx/java/com/android/dx/dex/file/ProtoIdItem.java b/dx/src/main/java/com/android/dx/dex/file/ProtoIdItem.java
index 235a8c8..235a8c8 100644
--- a/src/dx/java/com/android/dx/dex/file/ProtoIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ProtoIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ProtoIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/ProtoIdsSection.java
index dc6e8ad..dc6e8ad 100644
--- a/src/dx/java/com/android/dx/dex/file/ProtoIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ProtoIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/Section.java b/dx/src/main/java/com/android/dx/dex/file/Section.java
index 3f04216..3f04216 100644
--- a/src/dx/java/com/android/dx/dex/file/Section.java
+++ b/dx/src/main/java/com/android/dx/dex/file/Section.java
diff --git a/src/dx/java/com/android/dx/dex/file/Statistics.java b/dx/src/main/java/com/android/dx/dex/file/Statistics.java
index 62e1832..62e1832 100644
--- a/src/dx/java/com/android/dx/dex/file/Statistics.java
+++ b/dx/src/main/java/com/android/dx/dex/file/Statistics.java
diff --git a/src/dx/java/com/android/dx/dex/file/StringDataItem.java b/dx/src/main/java/com/android/dx/dex/file/StringDataItem.java
index e85a823..e85a823 100644
--- a/src/dx/java/com/android/dx/dex/file/StringDataItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/StringDataItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/StringIdItem.java b/dx/src/main/java/com/android/dx/dex/file/StringIdItem.java
index 533427d..533427d 100644
--- a/src/dx/java/com/android/dx/dex/file/StringIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/StringIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/StringIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/StringIdsSection.java
index 2f7c40b..2f7c40b 100644
--- a/src/dx/java/com/android/dx/dex/file/StringIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/StringIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/TypeIdItem.java b/dx/src/main/java/com/android/dx/dex/file/TypeIdItem.java
index 04be2a1..04be2a1 100644
--- a/src/dx/java/com/android/dx/dex/file/TypeIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/TypeIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/TypeIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/TypeIdsSection.java
index bcc8250..bcc8250 100644
--- a/src/dx/java/com/android/dx/dex/file/TypeIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/TypeIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/TypeListItem.java b/dx/src/main/java/com/android/dx/dex/file/TypeListItem.java
index b815dd3..b815dd3 100644
--- a/src/dx/java/com/android/dx/dex/file/TypeListItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/TypeListItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/UniformItemSection.java b/dx/src/main/java/com/android/dx/dex/file/UniformItemSection.java
index d8c09ab..d8c09ab 100644
--- a/src/dx/java/com/android/dx/dex/file/UniformItemSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/UniformItemSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/UniformListItem.java b/dx/src/main/java/com/android/dx/dex/file/UniformListItem.java
index 88919c7..88919c7 100644
--- a/src/dx/java/com/android/dx/dex/file/UniformListItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/UniformListItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ValueEncoder.java b/dx/src/main/java/com/android/dx/dex/file/ValueEncoder.java
index 9c433a3..9c433a3 100644
--- a/src/dx/java/com/android/dx/dex/file/ValueEncoder.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ValueEncoder.java
diff --git a/src/dx/java/com/android/dx/io/Code.java b/dx/src/main/java/com/android/dx/io/Code.java
index ba95d1b..ba95d1b 100644
--- a/src/dx/java/com/android/dx/io/Code.java
+++ b/dx/src/main/java/com/android/dx/io/Code.java
diff --git a/src/dx/java/com/android/dx/io/CodeReader.java b/dx/src/main/java/com/android/dx/io/CodeReader.java
index cab1063..cab1063 100644
--- a/src/dx/java/com/android/dx/io/CodeReader.java
+++ b/dx/src/main/java/com/android/dx/io/CodeReader.java
diff --git a/src/dx/java/com/android/dx/io/IndexType.java b/dx/src/main/java/com/android/dx/io/IndexType.java
index bbddfa8..bbddfa8 100644
--- a/src/dx/java/com/android/dx/io/IndexType.java
+++ b/dx/src/main/java/com/android/dx/io/IndexType.java
diff --git a/src/dx/java/com/android/dx/io/OpcodeInfo.java b/dx/src/main/java/com/android/dx/io/OpcodeInfo.java
index c8fcf25..c8fcf25 100644
--- a/src/dx/java/com/android/dx/io/OpcodeInfo.java
+++ b/dx/src/main/java/com/android/dx/io/OpcodeInfo.java
diff --git a/src/dx/java/com/android/dx/io/Opcodes.java b/dx/src/main/java/com/android/dx/io/Opcodes.java
index 4a255f7..4a255f7 100644
--- a/src/dx/java/com/android/dx/io/Opcodes.java
+++ b/dx/src/main/java/com/android/dx/io/Opcodes.java
diff --git a/src/dx/java/com/android/dx/io/instructions/AddressMap.java b/dx/src/main/java/com/android/dx/io/instructions/AddressMap.java
index a8dbe0b..a8dbe0b 100644
--- a/src/dx/java/com/android/dx/io/instructions/AddressMap.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/AddressMap.java
diff --git a/src/dx/java/com/android/dx/io/instructions/BaseCodeCursor.java b/dx/src/main/java/com/android/dx/io/instructions/BaseCodeCursor.java
index 6915fa8..6915fa8 100644
--- a/src/dx/java/com/android/dx/io/instructions/BaseCodeCursor.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/BaseCodeCursor.java
diff --git a/src/dx/java/com/android/dx/io/instructions/CodeCursor.java b/dx/src/main/java/com/android/dx/io/instructions/CodeCursor.java
index 68eb9c9..68eb9c9 100644
--- a/src/dx/java/com/android/dx/io/instructions/CodeCursor.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/CodeCursor.java
diff --git a/src/dx/java/com/android/dx/io/instructions/CodeInput.java b/dx/src/main/java/com/android/dx/io/instructions/CodeInput.java
index 41a5ef7..41a5ef7 100644
--- a/src/dx/java/com/android/dx/io/instructions/CodeInput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/CodeInput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/CodeOutput.java b/dx/src/main/java/com/android/dx/io/instructions/CodeOutput.java
index 7d0077e..7d0077e 100644
--- a/src/dx/java/com/android/dx/io/instructions/CodeOutput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/CodeOutput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/DecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/DecodedInstruction.java
index 9d9e88e..9d9e88e 100644
--- a/src/dx/java/com/android/dx/io/instructions/DecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/DecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
index 64fc55b..64fc55b 100644
--- a/src/dx/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
index 6e14d34..6e14d34 100644
--- a/src/dx/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
index 29836d0..29836d0 100644
--- a/src/dx/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/InstructionCodec.java b/dx/src/main/java/com/android/dx/io/instructions/InstructionCodec.java
index b864b83..b864b83 100644
--- a/src/dx/java/com/android/dx/io/instructions/InstructionCodec.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/InstructionCodec.java
diff --git a/src/dx/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
index fd38e3b..fd38e3b 100644
--- a/src/dx/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
index c31d319..c31d319 100644
--- a/src/dx/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
index f294f63..f294f63 100644
--- a/src/dx/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeInput.java b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeInput.java
index 49ce473..49ce473 100644
--- a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeInput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeInput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java
index efa7ddd..efa7ddd 100644
--- a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
index bfc47c9..bfc47c9 100644
--- a/src/dx/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
index a463677..a463677 100644
--- a/src/dx/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
index acb77ba..acb77ba 100644
--- a/src/dx/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
index 172caa4..172caa4 100644
--- a/src/dx/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/Annotation.java b/dx/src/main/java/com/android/dx/rop/annotation/Annotation.java
index 8f9e976..8f9e976 100644
--- a/src/dx/java/com/android/dx/rop/annotation/Annotation.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/Annotation.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/AnnotationVisibility.java b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationVisibility.java
index c717b8c..c717b8c 100644
--- a/src/dx/java/com/android/dx/rop/annotation/AnnotationVisibility.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationVisibility.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/Annotations.java b/dx/src/main/java/com/android/dx/rop/annotation/Annotations.java
index 807d5d4..807d5d4 100644
--- a/src/dx/java/com/android/dx/rop/annotation/Annotations.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/Annotations.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/AnnotationsList.java b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationsList.java
index b97b385..b97b385 100644
--- a/src/dx/java/com/android/dx/rop/annotation/AnnotationsList.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationsList.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/NameValuePair.java b/dx/src/main/java/com/android/dx/rop/annotation/NameValuePair.java
index 56c4936..56c4936 100644
--- a/src/dx/java/com/android/dx/rop/annotation/NameValuePair.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/NameValuePair.java
diff --git a/src/dx/java/com/android/dx/rop/code/AccessFlags.java b/dx/src/main/java/com/android/dx/rop/code/AccessFlags.java
index 2d84fe8..2d84fe8 100644
--- a/src/dx/java/com/android/dx/rop/code/AccessFlags.java
+++ b/dx/src/main/java/com/android/dx/rop/code/AccessFlags.java
diff --git a/src/dx/java/com/android/dx/rop/code/BasicBlock.java b/dx/src/main/java/com/android/dx/rop/code/BasicBlock.java
index 9d99833..9d99833 100644
--- a/src/dx/java/com/android/dx/rop/code/BasicBlock.java
+++ b/dx/src/main/java/com/android/dx/rop/code/BasicBlock.java
diff --git a/src/dx/java/com/android/dx/rop/code/BasicBlockList.java b/dx/src/main/java/com/android/dx/rop/code/BasicBlockList.java
index ef79075..ef79075 100644
--- a/src/dx/java/com/android/dx/rop/code/BasicBlockList.java
+++ b/dx/src/main/java/com/android/dx/rop/code/BasicBlockList.java
diff --git a/src/dx/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java b/dx/src/main/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java
index 6c48acf..6c48acf 100644
--- a/src/dx/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java
+++ b/dx/src/main/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java
diff --git a/src/dx/java/com/android/dx/rop/code/CstInsn.java b/dx/src/main/java/com/android/dx/rop/code/CstInsn.java
index d7de2f4..d7de2f4 100644
--- a/src/dx/java/com/android/dx/rop/code/CstInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/CstInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/DexTranslationAdvice.java b/dx/src/main/java/com/android/dx/rop/code/DexTranslationAdvice.java
index 35ce2f2..35ce2f2 100644
--- a/src/dx/java/com/android/dx/rop/code/DexTranslationAdvice.java
+++ b/dx/src/main/java/com/android/dx/rop/code/DexTranslationAdvice.java
diff --git a/src/dx/java/com/android/dx/rop/code/Exceptions.java b/dx/src/main/java/com/android/dx/rop/code/Exceptions.java
index 1e27a8c..1e27a8c 100644
--- a/src/dx/java/com/android/dx/rop/code/Exceptions.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Exceptions.java
diff --git a/src/dx/java/com/android/dx/rop/code/FillArrayDataInsn.java b/dx/src/main/java/com/android/dx/rop/code/FillArrayDataInsn.java
index ed9345d..ed9345d 100644
--- a/src/dx/java/com/android/dx/rop/code/FillArrayDataInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/FillArrayDataInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/Insn.java b/dx/src/main/java/com/android/dx/rop/code/Insn.java
index 5031f89..5031f89 100644
--- a/src/dx/java/com/android/dx/rop/code/Insn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Insn.java
diff --git a/src/dx/java/com/android/dx/rop/code/InsnList.java b/dx/src/main/java/com/android/dx/rop/code/InsnList.java
index 88abd72..88abd72 100644
--- a/src/dx/java/com/android/dx/rop/code/InsnList.java
+++ b/dx/src/main/java/com/android/dx/rop/code/InsnList.java
diff --git a/src/dx/java/com/android/dx/rop/code/LocalItem.java b/dx/src/main/java/com/android/dx/rop/code/LocalItem.java
index d238f21..d238f21 100644
--- a/src/dx/java/com/android/dx/rop/code/LocalItem.java
+++ b/dx/src/main/java/com/android/dx/rop/code/LocalItem.java
diff --git a/src/dx/java/com/android/dx/rop/code/LocalVariableExtractor.java b/dx/src/main/java/com/android/dx/rop/code/LocalVariableExtractor.java
index c2c4021..c2c4021 100644
--- a/src/dx/java/com/android/dx/rop/code/LocalVariableExtractor.java
+++ b/dx/src/main/java/com/android/dx/rop/code/LocalVariableExtractor.java
diff --git a/src/dx/java/com/android/dx/rop/code/LocalVariableInfo.java b/dx/src/main/java/com/android/dx/rop/code/LocalVariableInfo.java
index 5d2b995..5d2b995 100644
--- a/src/dx/java/com/android/dx/rop/code/LocalVariableInfo.java
+++ b/dx/src/main/java/com/android/dx/rop/code/LocalVariableInfo.java
diff --git a/src/dx/java/com/android/dx/rop/code/PlainCstInsn.java b/dx/src/main/java/com/android/dx/rop/code/PlainCstInsn.java
index fffa76b..fffa76b 100644
--- a/src/dx/java/com/android/dx/rop/code/PlainCstInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/PlainCstInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/PlainInsn.java b/dx/src/main/java/com/android/dx/rop/code/PlainInsn.java
index 3b52efa..3b52efa 100644
--- a/src/dx/java/com/android/dx/rop/code/PlainInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/PlainInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegOps.java b/dx/src/main/java/com/android/dx/rop/code/RegOps.java
index c81398d..c81398d 100644
--- a/src/dx/java/com/android/dx/rop/code/RegOps.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegOps.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegisterSpec.java b/dx/src/main/java/com/android/dx/rop/code/RegisterSpec.java
index e5f908b..e5f908b 100644
--- a/src/dx/java/com/android/dx/rop/code/RegisterSpec.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegisterSpec.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegisterSpecList.java b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecList.java
index 3d891fd..3d891fd 100644
--- a/src/dx/java/com/android/dx/rop/code/RegisterSpecList.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecList.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegisterSpecSet.java b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecSet.java
index 14ef778..14ef778 100644
--- a/src/dx/java/com/android/dx/rop/code/RegisterSpecSet.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecSet.java
diff --git a/src/dx/java/com/android/dx/rop/code/Rop.java b/dx/src/main/java/com/android/dx/rop/code/Rop.java
index 8224584..8224584 100644
--- a/src/dx/java/com/android/dx/rop/code/Rop.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Rop.java
diff --git a/src/dx/java/com/android/dx/rop/code/RopMethod.java b/dx/src/main/java/com/android/dx/rop/code/RopMethod.java
index 591d325..591d325 100644
--- a/src/dx/java/com/android/dx/rop/code/RopMethod.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RopMethod.java
diff --git a/src/dx/java/com/android/dx/rop/code/Rops.java b/dx/src/main/java/com/android/dx/rop/code/Rops.java
index c1f4f46..c1f4f46 100644
--- a/src/dx/java/com/android/dx/rop/code/Rops.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Rops.java
diff --git a/src/dx/java/com/android/dx/rop/code/SourcePosition.java b/dx/src/main/java/com/android/dx/rop/code/SourcePosition.java
index 11ac992..11ac992 100644
--- a/src/dx/java/com/android/dx/rop/code/SourcePosition.java
+++ b/dx/src/main/java/com/android/dx/rop/code/SourcePosition.java
diff --git a/src/dx/java/com/android/dx/rop/code/SwitchInsn.java b/dx/src/main/java/com/android/dx/rop/code/SwitchInsn.java
index 31bb94d..31bb94d 100644
--- a/src/dx/java/com/android/dx/rop/code/SwitchInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/SwitchInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/ThrowingCstInsn.java b/dx/src/main/java/com/android/dx/rop/code/ThrowingCstInsn.java
index dee01b5..dee01b5 100644
--- a/src/dx/java/com/android/dx/rop/code/ThrowingCstInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/ThrowingCstInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/ThrowingInsn.java b/dx/src/main/java/com/android/dx/rop/code/ThrowingInsn.java
index 6561d41..6561d41 100644
--- a/src/dx/java/com/android/dx/rop/code/ThrowingInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/ThrowingInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/TranslationAdvice.java b/dx/src/main/java/com/android/dx/rop/code/TranslationAdvice.java
index 832d84d..832d84d 100644
--- a/src/dx/java/com/android/dx/rop/code/TranslationAdvice.java
+++ b/dx/src/main/java/com/android/dx/rop/code/TranslationAdvice.java
diff --git a/src/dx/java/com/android/dx/rop/cst/Constant.java b/dx/src/main/java/com/android/dx/rop/cst/Constant.java
index 3ef035e..3ef035e 100644
--- a/src/dx/java/com/android/dx/rop/cst/Constant.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/Constant.java
diff --git a/src/dx/java/com/android/dx/rop/cst/ConstantPool.java b/dx/src/main/java/com/android/dx/rop/cst/ConstantPool.java
index efc394d..efc394d 100644
--- a/src/dx/java/com/android/dx/rop/cst/ConstantPool.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/ConstantPool.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstAnnotation.java b/dx/src/main/java/com/android/dx/rop/cst/CstAnnotation.java
index 8cdf1df..8cdf1df 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstAnnotation.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstAnnotation.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstArray.java b/dx/src/main/java/com/android/dx/rop/cst/CstArray.java
index 2766b5f..2766b5f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstArray.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstArray.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstBaseMethodRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstBaseMethodRef.java
index 5b0aeb6..5b0aeb6 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstBaseMethodRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstBaseMethodRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstBoolean.java b/dx/src/main/java/com/android/dx/rop/cst/CstBoolean.java
index 5ff858a..5ff858a 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstBoolean.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstBoolean.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstByte.java b/dx/src/main/java/com/android/dx/rop/cst/CstByte.java
index fc8f58f..fc8f58f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstByte.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstByte.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstChar.java b/dx/src/main/java/com/android/dx/rop/cst/CstChar.java
index 21d8b67..21d8b67 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstChar.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstChar.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstDouble.java b/dx/src/main/java/com/android/dx/rop/cst/CstDouble.java
index 8f1766f..8f1766f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstDouble.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstDouble.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstEnumRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstEnumRef.java
index 641ab3f..641ab3f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstEnumRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstEnumRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstFieldRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstFieldRef.java
index a4d7180..a4d7180 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstFieldRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstFieldRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstFloat.java b/dx/src/main/java/com/android/dx/rop/cst/CstFloat.java
index 0a2354a..0a2354a 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstFloat.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstFloat.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstInteger.java b/dx/src/main/java/com/android/dx/rop/cst/CstInteger.java
index 3691fc0..3691fc0 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstInteger.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstInteger.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java
index 8b8cb30..8b8cb30 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstKnownNull.java b/dx/src/main/java/com/android/dx/rop/cst/CstKnownNull.java
index a80322c..a80322c 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstKnownNull.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstKnownNull.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLiteral32.java b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral32.java
index 042cbd9..042cbd9 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLiteral32.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral32.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLiteral64.java b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral64.java
index 94cfa8c..94cfa8c 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLiteral64.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral64.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLiteralBits.java b/dx/src/main/java/com/android/dx/rop/cst/CstLiteralBits.java
index 8bf13a2..8bf13a2 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLiteralBits.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLiteralBits.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLong.java b/dx/src/main/java/com/android/dx/rop/cst/CstLong.java
index d159529..d159529 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLong.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLong.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstMemberRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstMemberRef.java
index 1775398..1775398 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstMemberRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstMemberRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstMethodRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstMethodRef.java
index 075bc7c..075bc7c 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstMethodRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstMethodRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstNat.java b/dx/src/main/java/com/android/dx/rop/cst/CstNat.java
index cd067e9..cd067e9 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstNat.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstNat.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstShort.java b/dx/src/main/java/com/android/dx/rop/cst/CstShort.java
index 5be1022..5be1022 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstShort.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstShort.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstString.java b/dx/src/main/java/com/android/dx/rop/cst/CstString.java
index a778e97..a778e97 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstString.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstString.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstType.java b/dx/src/main/java/com/android/dx/rop/cst/CstType.java
index 8624028..8624028 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstType.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstType.java
diff --git a/src/dx/java/com/android/dx/rop/cst/StdConstantPool.java b/dx/src/main/java/com/android/dx/rop/cst/StdConstantPool.java
index 244395d..244395d 100644
--- a/src/dx/java/com/android/dx/rop/cst/StdConstantPool.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/StdConstantPool.java
diff --git a/src/dx/java/com/android/dx/rop/cst/TypedConstant.java b/dx/src/main/java/com/android/dx/rop/cst/TypedConstant.java
index 1c738ee..1c738ee 100644
--- a/src/dx/java/com/android/dx/rop/cst/TypedConstant.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/TypedConstant.java
diff --git a/src/dx/java/com/android/dx/rop/cst/Zeroes.java b/dx/src/main/java/com/android/dx/rop/cst/Zeroes.java
index 7250b5a..7250b5a 100644
--- a/src/dx/java/com/android/dx/rop/cst/Zeroes.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/Zeroes.java
diff --git a/src/dx/java/com/android/dx/rop/type/Prototype.java b/dx/src/main/java/com/android/dx/rop/type/Prototype.java
index 3fc5d82..3fc5d82 100644
--- a/src/dx/java/com/android/dx/rop/type/Prototype.java
+++ b/dx/src/main/java/com/android/dx/rop/type/Prototype.java
diff --git a/src/dx/java/com/android/dx/rop/type/StdTypeList.java b/dx/src/main/java/com/android/dx/rop/type/StdTypeList.java
index fe6647c..fe6647c 100644
--- a/src/dx/java/com/android/dx/rop/type/StdTypeList.java
+++ b/dx/src/main/java/com/android/dx/rop/type/StdTypeList.java
diff --git a/src/dx/java/com/android/dx/rop/type/Type.java b/dx/src/main/java/com/android/dx/rop/type/Type.java
index c564fab..c564fab 100644
--- a/src/dx/java/com/android/dx/rop/type/Type.java
+++ b/dx/src/main/java/com/android/dx/rop/type/Type.java
diff --git a/src/dx/java/com/android/dx/rop/type/TypeBearer.java b/dx/src/main/java/com/android/dx/rop/type/TypeBearer.java
index b03dbaf..b03dbaf 100644
--- a/src/dx/java/com/android/dx/rop/type/TypeBearer.java
+++ b/dx/src/main/java/com/android/dx/rop/type/TypeBearer.java
diff --git a/src/dx/java/com/android/dx/rop/type/TypeList.java b/dx/src/main/java/com/android/dx/rop/type/TypeList.java
index de2d62e..de2d62e 100644
--- a/src/dx/java/com/android/dx/rop/type/TypeList.java
+++ b/dx/src/main/java/com/android/dx/rop/type/TypeList.java
diff --git a/src/dx/java/com/android/dx/ssa/BasicRegisterMapper.java b/dx/src/main/java/com/android/dx/ssa/BasicRegisterMapper.java
index 83045b2..83045b2 100644
--- a/src/dx/java/com/android/dx/ssa/BasicRegisterMapper.java
+++ b/dx/src/main/java/com/android/dx/ssa/BasicRegisterMapper.java
diff --git a/src/dx/java/com/android/dx/ssa/ConstCollector.java b/dx/src/main/java/com/android/dx/ssa/ConstCollector.java
index 62d629f..62d629f 100644
--- a/src/dx/java/com/android/dx/ssa/ConstCollector.java
+++ b/dx/src/main/java/com/android/dx/ssa/ConstCollector.java
diff --git a/src/dx/java/com/android/dx/ssa/DeadCodeRemover.java b/dx/src/main/java/com/android/dx/ssa/DeadCodeRemover.java
index 07fb553..07fb553 100644
--- a/src/dx/java/com/android/dx/ssa/DeadCodeRemover.java
+++ b/dx/src/main/java/com/android/dx/ssa/DeadCodeRemover.java
diff --git a/src/dx/java/com/android/dx/ssa/DomFront.java b/dx/src/main/java/com/android/dx/ssa/DomFront.java
index 941a317..941a317 100644
--- a/src/dx/java/com/android/dx/ssa/DomFront.java
+++ b/dx/src/main/java/com/android/dx/ssa/DomFront.java
diff --git a/src/dx/java/com/android/dx/ssa/Dominators.java b/dx/src/main/java/com/android/dx/ssa/Dominators.java
index 503e857..503e857 100644
--- a/src/dx/java/com/android/dx/ssa/Dominators.java
+++ b/dx/src/main/java/com/android/dx/ssa/Dominators.java
diff --git a/src/dx/java/com/android/dx/ssa/EscapeAnalysis.java b/dx/src/main/java/com/android/dx/ssa/EscapeAnalysis.java
index b02c929..b02c929 100644
--- a/src/dx/java/com/android/dx/ssa/EscapeAnalysis.java
+++ b/dx/src/main/java/com/android/dx/ssa/EscapeAnalysis.java
diff --git a/src/dx/java/com/android/dx/ssa/InterferenceRegisterMapper.java b/dx/src/main/java/com/android/dx/ssa/InterferenceRegisterMapper.java
index 851249b..851249b 100644
--- a/src/dx/java/com/android/dx/ssa/InterferenceRegisterMapper.java
+++ b/dx/src/main/java/com/android/dx/ssa/InterferenceRegisterMapper.java
diff --git a/src/dx/java/com/android/dx/ssa/LiteralOpUpgrader.java b/dx/src/main/java/com/android/dx/ssa/LiteralOpUpgrader.java
index f3976f2..f3976f2 100644
--- a/src/dx/java/com/android/dx/ssa/LiteralOpUpgrader.java
+++ b/dx/src/main/java/com/android/dx/ssa/LiteralOpUpgrader.java
diff --git a/src/dx/java/com/android/dx/ssa/LocalVariableExtractor.java b/dx/src/main/java/com/android/dx/ssa/LocalVariableExtractor.java
index 11d53cf..11d53cf 100644
--- a/src/dx/java/com/android/dx/ssa/LocalVariableExtractor.java
+++ b/dx/src/main/java/com/android/dx/ssa/LocalVariableExtractor.java
diff --git a/src/dx/java/com/android/dx/ssa/LocalVariableInfo.java b/dx/src/main/java/com/android/dx/ssa/LocalVariableInfo.java
index 8845270..8845270 100644
--- a/src/dx/java/com/android/dx/ssa/LocalVariableInfo.java
+++ b/dx/src/main/java/com/android/dx/ssa/LocalVariableInfo.java
diff --git a/src/dx/java/com/android/dx/ssa/MoveParamCombiner.java b/dx/src/main/java/com/android/dx/ssa/MoveParamCombiner.java
index 41660d2..41660d2 100644
--- a/src/dx/java/com/android/dx/ssa/MoveParamCombiner.java
+++ b/dx/src/main/java/com/android/dx/ssa/MoveParamCombiner.java
diff --git a/src/dx/java/com/android/dx/ssa/NormalSsaInsn.java b/dx/src/main/java/com/android/dx/ssa/NormalSsaInsn.java
index cfef400..cfef400 100644
--- a/src/dx/java/com/android/dx/ssa/NormalSsaInsn.java
+++ b/dx/src/main/java/com/android/dx/ssa/NormalSsaInsn.java
diff --git a/src/dx/java/com/android/dx/ssa/Optimizer.java b/dx/src/main/java/com/android/dx/ssa/Optimizer.java
index 42ae166..42ae166 100644
--- a/src/dx/java/com/android/dx/ssa/Optimizer.java
+++ b/dx/src/main/java/com/android/dx/ssa/Optimizer.java
diff --git a/src/dx/java/com/android/dx/ssa/PhiInsn.java b/dx/src/main/java/com/android/dx/ssa/PhiInsn.java
index bc9c4b0..bc9c4b0 100644
--- a/src/dx/java/com/android/dx/ssa/PhiInsn.java
+++ b/dx/src/main/java/com/android/dx/ssa/PhiInsn.java
diff --git a/src/dx/java/com/android/dx/ssa/PhiTypeResolver.java b/dx/src/main/java/com/android/dx/ssa/PhiTypeResolver.java
index 4b8b4e3..4b8b4e3 100644
--- a/src/dx/java/com/android/dx/ssa/PhiTypeResolver.java
+++ b/dx/src/main/java/com/android/dx/ssa/PhiTypeResolver.java
diff --git a/src/dx/java/com/android/dx/ssa/RegisterMapper.java b/dx/src/main/java/com/android/dx/ssa/RegisterMapper.java
index bef941f..bef941f 100644
--- a/src/dx/java/com/android/dx/ssa/RegisterMapper.java
+++ b/dx/src/main/java/com/android/dx/ssa/RegisterMapper.java
diff --git a/src/dx/java/com/android/dx/ssa/SCCP.java b/dx/src/main/java/com/android/dx/ssa/SCCP.java
index 1c869e1..1c869e1 100644
--- a/src/dx/java/com/android/dx/ssa/SCCP.java
+++ b/dx/src/main/java/com/android/dx/ssa/SCCP.java
diff --git a/src/dx/java/com/android/dx/ssa/SetFactory.java b/dx/src/main/java/com/android/dx/ssa/SetFactory.java
index 92e965f..92e965f 100644
--- a/src/dx/java/com/android/dx/ssa/SetFactory.java
+++ b/dx/src/main/java/com/android/dx/ssa/SetFactory.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaBasicBlock.java b/dx/src/main/java/com/android/dx/ssa/SsaBasicBlock.java
index 499f59f..499f59f 100644
--- a/src/dx/java/com/android/dx/ssa/SsaBasicBlock.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaBasicBlock.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaConverter.java b/dx/src/main/java/com/android/dx/ssa/SsaConverter.java
index 5cd8b6f..5cd8b6f 100644
--- a/src/dx/java/com/android/dx/ssa/SsaConverter.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaConverter.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaInsn.java b/dx/src/main/java/com/android/dx/ssa/SsaInsn.java
index ca7a1a2..ca7a1a2 100644
--- a/src/dx/java/com/android/dx/ssa/SsaInsn.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaInsn.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaMethod.java b/dx/src/main/java/com/android/dx/ssa/SsaMethod.java
index 4c2bd85..4c2bd85 100644
--- a/src/dx/java/com/android/dx/ssa/SsaMethod.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaMethod.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaRenamer.java b/dx/src/main/java/com/android/dx/ssa/SsaRenamer.java
index 58e4142..58e4142 100644
--- a/src/dx/java/com/android/dx/ssa/SsaRenamer.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaRenamer.java
diff --git a/src/dx/java/com/android/dx/ssa/back/FirstFitAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/FirstFitAllocator.java
index 6416e84..6416e84 100644
--- a/src/dx/java/com/android/dx/ssa/back/FirstFitAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/FirstFitAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java
index 9ef95a7..9ef95a7 100644
--- a/src/dx/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java b/dx/src/main/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java
index 515b04f..515b04f 100644
--- a/src/dx/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java
diff --git a/src/dx/java/com/android/dx/ssa/back/InterferenceGraph.java b/dx/src/main/java/com/android/dx/ssa/back/InterferenceGraph.java
index e6cde62..e6cde62 100644
--- a/src/dx/java/com/android/dx/ssa/back/InterferenceGraph.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/InterferenceGraph.java
diff --git a/src/dx/java/com/android/dx/ssa/back/LivenessAnalyzer.java b/dx/src/main/java/com/android/dx/ssa/back/LivenessAnalyzer.java
index a293e6f..a293e6f 100644
--- a/src/dx/java/com/android/dx/ssa/back/LivenessAnalyzer.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/LivenessAnalyzer.java
diff --git a/src/dx/java/com/android/dx/ssa/back/NullRegisterAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/NullRegisterAllocator.java
index 0205c11..0205c11 100644
--- a/src/dx/java/com/android/dx/ssa/back/NullRegisterAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/NullRegisterAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/RegisterAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/RegisterAllocator.java
index 1f9f70f..1f9f70f 100644
--- a/src/dx/java/com/android/dx/ssa/back/RegisterAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/RegisterAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/SsaToRop.java b/dx/src/main/java/com/android/dx/ssa/back/SsaToRop.java
index 0e30250..0e30250 100644
--- a/src/dx/java/com/android/dx/ssa/back/SsaToRop.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/SsaToRop.java
diff --git a/src/dx/java/com/android/dx/util/AnnotatedOutput.java b/dx/src/main/java/com/android/dx/util/AnnotatedOutput.java
index 7a9ea29..7a9ea29 100644
--- a/src/dx/java/com/android/dx/util/AnnotatedOutput.java
+++ b/dx/src/main/java/com/android/dx/util/AnnotatedOutput.java
diff --git a/src/dx/java/com/android/dx/util/BitIntSet.java b/dx/src/main/java/com/android/dx/util/BitIntSet.java
index b364f0c..b364f0c 100644
--- a/src/dx/java/com/android/dx/util/BitIntSet.java
+++ b/dx/src/main/java/com/android/dx/util/BitIntSet.java
diff --git a/src/dx/java/com/android/dx/util/Bits.java b/dx/src/main/java/com/android/dx/util/Bits.java
index cbc0a5b..cbc0a5b 100644
--- a/src/dx/java/com/android/dx/util/Bits.java
+++ b/dx/src/main/java/com/android/dx/util/Bits.java
diff --git a/src/dx/java/com/android/dx/util/ByteArray.java b/dx/src/main/java/com/android/dx/util/ByteArray.java
index 21d0457..21d0457 100644
--- a/src/dx/java/com/android/dx/util/ByteArray.java
+++ b/dx/src/main/java/com/android/dx/util/ByteArray.java
diff --git a/src/dx/java/com/android/dx/util/ByteArrayAnnotatedOutput.java b/dx/src/main/java/com/android/dx/util/ByteArrayAnnotatedOutput.java
index 05ec733..05ec733 100644
--- a/src/dx/java/com/android/dx/util/ByteArrayAnnotatedOutput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteArrayAnnotatedOutput.java
diff --git a/src/dx/java/com/android/dx/util/ByteArrayByteInput.java b/dx/src/main/java/com/android/dx/util/ByteArrayByteInput.java
index 07c543f..07c543f 100644
--- a/src/dx/java/com/android/dx/util/ByteArrayByteInput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteArrayByteInput.java
diff --git a/src/dx/java/com/android/dx/util/ByteInput.java b/dx/src/main/java/com/android/dx/util/ByteInput.java
index 8181e3e..8181e3e 100644
--- a/src/dx/java/com/android/dx/util/ByteInput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteInput.java
diff --git a/src/dx/java/com/android/dx/util/ByteOutput.java b/dx/src/main/java/com/android/dx/util/ByteOutput.java
index 512dcf8..512dcf8 100644
--- a/src/dx/java/com/android/dx/util/ByteOutput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteOutput.java
diff --git a/src/dx/java/com/android/dx/util/DexException.java b/dx/src/main/java/com/android/dx/util/DexException.java
index 527b0b9..527b0b9 100644
--- a/src/dx/java/com/android/dx/util/DexException.java
+++ b/dx/src/main/java/com/android/dx/util/DexException.java
diff --git a/src/dx/java/com/android/dx/util/ExceptionWithContext.java b/dx/src/main/java/com/android/dx/util/ExceptionWithContext.java
index 7f8523c..7f8523c 100644
--- a/src/dx/java/com/android/dx/util/ExceptionWithContext.java
+++ b/dx/src/main/java/com/android/dx/util/ExceptionWithContext.java
diff --git a/src/dx/java/com/android/dx/util/FileUtils.java b/dx/src/main/java/com/android/dx/util/FileUtils.java
index bcf6729..bcf6729 100644
--- a/src/dx/java/com/android/dx/util/FileUtils.java
+++ b/dx/src/main/java/com/android/dx/util/FileUtils.java
diff --git a/src/dx/java/com/android/dx/util/FixedSizeList.java b/dx/src/main/java/com/android/dx/util/FixedSizeList.java
index fb3af04..fb3af04 100644
--- a/src/dx/java/com/android/dx/util/FixedSizeList.java
+++ b/dx/src/main/java/com/android/dx/util/FixedSizeList.java
diff --git a/src/dx/java/com/android/dx/util/Hex.java b/dx/src/main/java/com/android/dx/util/Hex.java
index e95669c..e95669c 100644
--- a/src/dx/java/com/android/dx/util/Hex.java
+++ b/dx/src/main/java/com/android/dx/util/Hex.java
diff --git a/src/dx/java/com/android/dx/util/HexParser.java b/dx/src/main/java/com/android/dx/util/HexParser.java
index 1b34345..1b34345 100644
--- a/src/dx/java/com/android/dx/util/HexParser.java
+++ b/dx/src/main/java/com/android/dx/util/HexParser.java
diff --git a/src/dx/java/com/android/dx/util/IndentingWriter.java b/dx/src/main/java/com/android/dx/util/IndentingWriter.java
index 3424e37..3424e37 100644
--- a/src/dx/java/com/android/dx/util/IndentingWriter.java
+++ b/dx/src/main/java/com/android/dx/util/IndentingWriter.java
diff --git a/src/dx/java/com/android/dx/util/IntIterator.java b/dx/src/main/java/com/android/dx/util/IntIterator.java
index 4caa439..4caa439 100644
--- a/src/dx/java/com/android/dx/util/IntIterator.java
+++ b/dx/src/main/java/com/android/dx/util/IntIterator.java
diff --git a/src/dx/java/com/android/dx/util/IntList.java b/dx/src/main/java/com/android/dx/util/IntList.java
index be400aa..be400aa 100644
--- a/src/dx/java/com/android/dx/util/IntList.java
+++ b/dx/src/main/java/com/android/dx/util/IntList.java
diff --git a/src/dx/java/com/android/dx/util/IntSet.java b/dx/src/main/java/com/android/dx/util/IntSet.java
index 33b6bdd..33b6bdd 100644
--- a/src/dx/java/com/android/dx/util/IntSet.java
+++ b/dx/src/main/java/com/android/dx/util/IntSet.java
diff --git a/src/dx/java/com/android/dx/util/LabeledItem.java b/dx/src/main/java/com/android/dx/util/LabeledItem.java
index b4856cf..b4856cf 100644
--- a/src/dx/java/com/android/dx/util/LabeledItem.java
+++ b/dx/src/main/java/com/android/dx/util/LabeledItem.java
diff --git a/src/dx/java/com/android/dx/util/LabeledList.java b/dx/src/main/java/com/android/dx/util/LabeledList.java
index 963b5aa..963b5aa 100644
--- a/src/dx/java/com/android/dx/util/LabeledList.java
+++ b/dx/src/main/java/com/android/dx/util/LabeledList.java
diff --git a/src/dx/java/com/android/dx/util/Leb128Utils.java b/dx/src/main/java/com/android/dx/util/Leb128Utils.java
index 1037463..1037463 100644
--- a/src/dx/java/com/android/dx/util/Leb128Utils.java
+++ b/dx/src/main/java/com/android/dx/util/Leb128Utils.java
diff --git a/src/dx/java/com/android/dx/util/ListIntSet.java b/dx/src/main/java/com/android/dx/util/ListIntSet.java
index 2b4fc21..2b4fc21 100644
--- a/src/dx/java/com/android/dx/util/ListIntSet.java
+++ b/dx/src/main/java/com/android/dx/util/ListIntSet.java
diff --git a/src/dx/java/com/android/dx/util/MutabilityControl.java b/dx/src/main/java/com/android/dx/util/MutabilityControl.java
index 14e0f2e..14e0f2e 100644
--- a/src/dx/java/com/android/dx/util/MutabilityControl.java
+++ b/dx/src/main/java/com/android/dx/util/MutabilityControl.java
diff --git a/src/dx/java/com/android/dx/util/MutabilityException.java b/dx/src/main/java/com/android/dx/util/MutabilityException.java
index bd21651..bd21651 100644
--- a/src/dx/java/com/android/dx/util/MutabilityException.java
+++ b/dx/src/main/java/com/android/dx/util/MutabilityException.java
diff --git a/src/dx/java/com/android/dx/util/Mutf8.java b/dx/src/main/java/com/android/dx/util/Mutf8.java
index fe55724..fe55724 100644
--- a/src/dx/java/com/android/dx/util/Mutf8.java
+++ b/dx/src/main/java/com/android/dx/util/Mutf8.java
diff --git a/src/dx/java/com/android/dx/util/Output.java b/dx/src/main/java/com/android/dx/util/Output.java
index e5956a2..e5956a2 100644
--- a/src/dx/java/com/android/dx/util/Output.java
+++ b/dx/src/main/java/com/android/dx/util/Output.java
diff --git a/src/dx/java/com/android/dx/util/ToHuman.java b/dx/src/main/java/com/android/dx/util/ToHuman.java
index b3a31a5..b3a31a5 100644
--- a/src/dx/java/com/android/dx/util/ToHuman.java
+++ b/dx/src/main/java/com/android/dx/util/ToHuman.java
diff --git a/src/dx/java/com/android/dx/util/TwoColumnOutput.java b/dx/src/main/java/com/android/dx/util/TwoColumnOutput.java
index ed2ab9f..ed2ab9f 100644
--- a/src/dx/java/com/android/dx/util/TwoColumnOutput.java
+++ b/dx/src/main/java/com/android/dx/util/TwoColumnOutput.java
diff --git a/src/dx/java/com/android/dx/util/Uint.java b/dx/src/main/java/com/android/dx/util/Uint.java
index 039756a..039756a 100644
--- a/src/dx/java/com/android/dx/util/Uint.java
+++ b/dx/src/main/java/com/android/dx/util/Uint.java
diff --git a/src/dx/java/com/android/dx/util/Unsigned.java b/dx/src/main/java/com/android/dx/util/Unsigned.java
index f15bd86..f15bd86 100644
--- a/src/dx/java/com/android/dx/util/Unsigned.java
+++ b/dx/src/main/java/com/android/dx/util/Unsigned.java
diff --git a/src/dx/java/com/android/dx/util/Warning.java b/dx/src/main/java/com/android/dx/util/Warning.java
index 3c23c7c..3c23c7c 100644
--- a/src/dx/java/com/android/dx/util/Warning.java
+++ b/dx/src/main/java/com/android/dx/util/Warning.java
diff --git a/src/dx/java/com/android/dx/util/Writers.java b/dx/src/main/java/com/android/dx/util/Writers.java
index eba845c..eba845c 100644
--- a/src/dx/java/com/android/dx/util/Writers.java
+++ b/dx/src/main/java/com/android/dx/util/Writers.java
diff --git a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
index 5063d75..5063d75 100644
--- a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
diff --git a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java b/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
index 2775a63..2775a63 100644
--- a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
diff --git a/src/mockito/java/com/google/dexmaker/mockito/UnsafeAllocator.java b/mockito/src/main/java/com/google/dexmaker/mockito/UnsafeAllocator.java
index 2e10b41..2e10b41 100644
--- a/src/mockito/java/com/google/dexmaker/mockito/UnsafeAllocator.java
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/UnsafeAllocator.java
diff --git a/src/mockito/resources/mockito-extensions/org.mockito.plugins.MockMaker b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
index 9f6df44..9f6df44 100644
--- a/src/mockito/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/src/mockito/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider
index 9f6df44..9f6df44 100644
--- a/src/mockito/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider
+++ b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider