commit 1933dcffacbf6ad2c0c531e31d33c9a3fa4cb4df
author Keun young Park <keunyoung@google.com> Thu Dec 15 16:12:21 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 15 16:12:21 2011 -0800
tree 41e8462b36da627b148ec5100c96b81192960c69
parent a0c0be6601d9e922d06cec0e24c08f9b47156ae5
parent 39a09e325849ddd69416ddf91cf4f29760e1e4a1

am 39a09e32: Merge "Add OpenGL compressed texture format list to the test result. - For device supporting ES 2.0, 2.0 API is used, but for 1.1 only device,       1.1 API is used. - re-organized XML parsing / writing in host side to re-use the same code. - update versi

* commit '39a09e325849ddd69416ddf91cf4f29760e1e4a1':
  Add OpenGL compressed texture format list to the test result. - For device supporting ES 2.0, 2.0 API is used, but for 1.1 only device,       1.1 API is used. - re-organized XML parsing / writing in host side to re-use the same code. - update version to 1.13

tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java

diff --git a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
index bd3f4fd..dae417f 100644
--- a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
@@ -631,7 +631,7 @@
             scanner.close();
         }
         if (scanner2 != null) {
-            scanner.close();
+            scanner2.close();
         }
         return md;
     }

tools/vm-tests/src/util/build/BuildDalvikSuite.java

diff --git a/tools/vm-tests/src/util/build/BuildDalvikSuite.java b/tools/vm-tests/src/util/build/BuildDalvikSuite.java
index eda6382..f08b651 100644
--- a/tools/vm-tests/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests/src/util/build/BuildDalvikSuite.java
@@ -794,7 +794,7 @@
 	    scanner.close();
 	}
 	if (scanner2 != null) {
-	    scanner.close();
+	    scanner2.close();
 	}
         return md;
     }