commit be967b814e0147ce8cbd20f301d26b41243166e9
author Nicolas Geoffray <ngeoffray@google.com> Fri Sep 11 22:13:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 11 22:13:59 2015 +0000
tree b1801f7cb1e5f59b547ea7c7535269c0990e6788
parent df244ae85f911408978b161e50b1bca18f09283b
parent dd0898e54fb76a7181eef4d6267dd6e5a0e9f999

am dd0898e5: Merge "Revert "Fixes incorrect update of DexMerger.main""

* commit 'dd0898e54fb76a7181eef4d6267dd6e5a0e9f999':
  Revert "Fixes incorrect update of DexMerger.main"

dx/src/com/android/dx/merge/DexMerger.java

diff --git a/dx/src/com/android/dx/merge/DexMerger.java b/dx/src/com/android/dx/merge/DexMerger.java
index 949c576..7c04776 100644
--- a/dx/src/com/android/dx/merge/DexMerger.java
+++ b/dx/src/com/android/dx/merge/DexMerger.java
@@ -1101,7 +1101,7 @@
 
         Dex[] dexes = new Dex[args.length - 1];
         for (int i = 1; i < args.length; i++) {
-            dexes[i - 1] = new Dex(new File(args[i]));
+            dexes[i] = new Dex(new File(args[i]));
         }
         Dex merged = new DexMerger(dexes, CollisionPolicy.KEEP_FIRST).merge();
         merged.writeTo(new File(args[0]));