Merge "Replace ASM 6.0_BETA with final release"
diff --git a/common/asm/Android.bp b/common/asm/Android.bp
index 1cfd948..1256551 100644
--- a/common/asm/Android.bp
+++ b/common/asm/Android.bp
@@ -33,22 +33,22 @@
 }
 
 java_import_host {
-    name: "asm-6.0_BETA",
-    jars: ["asm-6.0_BETA.jar"],
+    name: "asm-6.0",
+    jars: ["asm-6.0.jar"],
 }
 
 java_import_host {
-    name: "asm-analysis-6.0_BETA",
-    jars: ["asm-analysis-6.0_BETA.jar"],
+    name: "asm-analysis-6.0",
+    jars: ["asm-analysis-6.0.jar"],
 }
 
 java_import_host {
-    name: "asm-commons-6.0_BETA",
-    jars: ["asm-commons-6.0_BETA.jar"],
+    name: "asm-commons-6.0",
+    jars: ["asm-commons-6.0.jar"],
 }
 
 java_import_host {
-    name: "asm-tree-6.0_BETA",
-    jars: ["asm-tree-6.0_BETA.jar"],
+    name: "asm-tree-6.0",
+    jars: ["asm-tree-6.0.jar"],
 }
 
diff --git a/common/asm/PREBUILT b/common/asm/PREBUILT
index 44ca80d..68748ba 100644
--- a/common/asm/PREBUILT
+++ b/common/asm/PREBUILT
@@ -2,4 +2,4 @@
 using the source archive hosted at
 
 http://download.forge.ow2.org/asm/asm-5.2.tar.gz
-http://download.forge.ow2.org/asm/asm-6.0_BETA.tar.gz
+http://download.forge.ow2.org/asm/asm-6.0.tar.gz
diff --git a/common/asm/asm-6.0.jar b/common/asm/asm-6.0.jar
new file mode 100644
index 0000000..cf2de27
--- /dev/null
+++ b/common/asm/asm-6.0.jar
Binary files differ
diff --git a/common/asm/asm-6.0_BETA.jar b/common/asm/asm-6.0_BETA.jar
deleted file mode 100644
index 6b2994d..0000000
--- a/common/asm/asm-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/asm-analysis-6.0.jar b/common/asm/asm-analysis-6.0.jar
new file mode 100644
index 0000000..6d8ae4f
--- /dev/null
+++ b/common/asm/asm-analysis-6.0.jar
Binary files differ
diff --git a/common/asm/asm-analysis-6.0_BETA.jar b/common/asm/asm-analysis-6.0_BETA.jar
deleted file mode 100644
index a46662f..0000000
--- a/common/asm/asm-analysis-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/asm-commons-6.0.jar b/common/asm/asm-commons-6.0.jar
new file mode 100644
index 0000000..33ba0c4
--- /dev/null
+++ b/common/asm/asm-commons-6.0.jar
Binary files differ
diff --git a/common/asm/asm-commons-6.0_BETA.jar b/common/asm/asm-commons-6.0_BETA.jar
deleted file mode 100644
index 6b2ae13..0000000
--- a/common/asm/asm-commons-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/asm-tree-6.0.jar b/common/asm/asm-tree-6.0.jar
new file mode 100644
index 0000000..2aa9815
--- /dev/null
+++ b/common/asm/asm-tree-6.0.jar
Binary files differ
diff --git a/common/asm/asm-tree-6.0_BETA.jar b/common/asm/asm-tree-6.0_BETA.jar
deleted file mode 100644
index b82c68c..0000000
--- a/common/asm/asm-tree-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/src-6.0.zip b/common/asm/src-6.0.zip
new file mode 100644
index 0000000..bc54d00
--- /dev/null
+++ b/common/asm/src-6.0.zip
Binary files differ
diff --git a/common/asm/src-6.0_BETA.zip b/common/asm/src-6.0_BETA.zip
deleted file mode 100644
index fad057f..0000000
--- a/common/asm/src-6.0_BETA.zip
+++ /dev/null
Binary files differ