Update offline repository It now matches the 2.2 versions (e.g. adds 2.2 final, removes some ancient versions such as 1.3, 1.5), removes betas and rc's. Unlike 2.2 however it keeps the 2.3-dev build that was checked in recently. Change-Id: I3b85ce014b77ed5ec71de7fce4a31943ac25d0b4

commit: 60c07f6f4cf714657affaffc1014a2bc88193a52 [log] [tgz]
author: Tor Norbye <tnorbye@google.com> Fri Sep 16 12:30:24 2016 -0700
committer: Tor Norbye <tnorbye@google.com> Fri Sep 16 12:30:24 2016 -0700
tree: bdc6fda5b19268b16507451403e4c3bfe5a58432
parent: 57f4b641975db66e903f906c8fa130528a092d74 [diff]
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0/baseLibrary-2.0.0.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0/baseLibrary-2.0.0.jar
deleted file mode 100644
index aac18c2..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0/baseLibrary-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.1.0/baseLibrary-2.1.0.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.1.0/baseLibrary-2.1.0.jar
deleted file mode 100644
index af56453..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.1.0/baseLibrary-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.1.0/baseLibrary-2.1.0.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.1.0/baseLibrary-2.1.0.pom
deleted file mode 100644
index 58f51f2..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.1.0/baseLibrary-2.1.0.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>baseLibrary</artifactId>
-  <version>2.1.0</version>
-  <name>Data Binding Base Library</name>
-  <description>Shared library between Data Binding runtime lib and compiler</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.jar
deleted file mode 100644
index ccce19b..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.pom
deleted file mode 100644
index c2d12d5..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>baseLibrary</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Data Binding Base Library</name>
-  <description>Shared library between Data Binding runtime lib and compiler</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.jar
deleted file mode 100644
index 0cb40e1..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.pom
deleted file mode 100644
index a6766b7..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>baseLibrary</artifactId>
-  <version>2.2.0-beta1</version>
-  <name>Data Binding Base Library</name>
-  <description>Shared library between Data Binding runtime lib and compiler</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta2/baseLibrary-2.2.0-beta2.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta2/baseLibrary-2.2.0-beta2.jar
deleted file mode 100644
index 9a36431..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta2/baseLibrary-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta2/baseLibrary-2.2.0-beta2.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta2/baseLibrary-2.2.0-beta2.pom
deleted file mode 100644
index 1e3c1d4..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta2/baseLibrary-2.2.0-beta2.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>baseLibrary</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Data Binding Base Library</name>
-  <description>Shared library between Data Binding runtime lib and compiler</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta3/baseLibrary-2.2.0-beta3.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta3/baseLibrary-2.2.0-beta3.pom
deleted file mode 100644
index a2907ac..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta3/baseLibrary-2.2.0-beta3.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>baseLibrary</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Data Binding Base Library</name>
-  <description>Shared library between Data Binding runtime lib and compiler</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-rc1/baseLibrary-2.2.0-rc1.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-rc1/baseLibrary-2.2.0-rc1.jar
deleted file mode 100644
index b0104b2..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-rc1/baseLibrary-2.2.0-rc1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-rc1/baseLibrary-2.2.0-rc1.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-rc1/baseLibrary-2.2.0-rc1.pom
deleted file mode 100644
index a3bc7d9..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-rc1/baseLibrary-2.2.0-rc1.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>baseLibrary</artifactId>
-  <version>2.2.0-rc1</version>
-  <name>Data Binding Base Library</name>
-  <description>Shared library between Data Binding runtime lib and compiler</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta3/baseLibrary-2.2.0-beta3.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0/baseLibrary-2.2.0.jar
similarity index 75%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta3/baseLibrary-2.2.0-beta3.jar
rename to common/offline-m2/com/android/databinding/baseLibrary/2.2.0/baseLibrary-2.2.0.jar
index b5e8dd6..cd3bcc3 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta3/baseLibrary-2.2.0-beta3.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0/baseLibrary-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0/baseLibrary-2.0.0.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0/baseLibrary-2.2.0.pom
similarity index 97%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.0.0/baseLibrary-2.0.0.pom
rename to common/offline-m2/com/android/databinding/baseLibrary/2.2.0/baseLibrary-2.2.0.pom
index 6320944..1b84c6d 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0/baseLibrary-2.0.0.pom
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0/baseLibrary-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>baseLibrary</artifactId>
-  <version>2.0.0</version>
+  <version>2.2.0</version>
   <name>Data Binding Base Library</name>
   <description>Shared library between Data Binding runtime lib and compiler</description>
   <url>http://tools.android.com</url>

diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0/compiler-2.0.0.jar b/common/offline-m2/com/android/databinding/compiler/2.0.0/compiler-2.0.0.jar
deleted file mode 100644
index 5c80a18..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.0.0/compiler-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0/compiler-2.0.0.pom b/common/offline-m2/com/android/databinding/compiler/2.0.0/compiler-2.0.0.pom
deleted file mode 100644
index 964ea14..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.0.0/compiler-2.0.0.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compiler</artifactId>
-  <version>2.0.0</version>
-  <name>Data Binding Annotation Processor</name>
-  <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tunnelvisionlabs</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compiler/2.1.0/compiler-2.1.0.jar b/common/offline-m2/com/android/databinding/compiler/2.1.0/compiler-2.1.0.jar
deleted file mode 100644
index 8f8c6bd..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.1.0/compiler-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compiler/2.1.0/compiler-2.1.0.pom b/common/offline-m2/com/android/databinding/compiler/2.1.0/compiler-2.1.0.pom
deleted file mode 100644
index 0315e8a..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.1.0/compiler-2.1.0.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compiler</artifactId>
-  <version>2.1.0</version>
-  <name>Data Binding Annotation Processor</name>
-  <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.jar b/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.jar
deleted file mode 100644
index d4b5c91..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.pom b/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.pom
deleted file mode 100644
index d574a04..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compiler</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Data Binding Annotation Processor</name>
-  <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.jar b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.jar
deleted file mode 100644
index ec2faaf..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.pom b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.pom
deleted file mode 100644
index 479b330..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compiler</artifactId>
-  <version>2.2.0-beta1</version>
-  <name>Data Binding Annotation Processor</name>
-  <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta2/compiler-2.2.0-beta2.jar b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta2/compiler-2.2.0-beta2.jar
deleted file mode 100644
index a3cd9cc..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta2/compiler-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta2/compiler-2.2.0-beta2.pom b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta2/compiler-2.2.0-beta2.pom
deleted file mode 100644
index 8f1dc8f..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta2/compiler-2.2.0-beta2.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compiler</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Data Binding Annotation Processor</name>
-  <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta3/compiler-2.2.0-beta3.jar b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta3/compiler-2.2.0-beta3.jar
deleted file mode 100644
index 052463c..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta3/compiler-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-rc1/compiler-2.2.0-rc1.pom b/common/offline-m2/com/android/databinding/compiler/2.2.0-rc1/compiler-2.2.0-rc1.pom
deleted file mode 100644
index a1ec0af..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-rc1/compiler-2.2.0-rc1.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compiler</artifactId>
-  <version>2.2.0-rc1</version>
-  <name>Data Binding Annotation Processor</name>
-  <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-rc1/compiler-2.2.0-rc1.jar b/common/offline-m2/com/android/databinding/compiler/2.2.0/compiler-2.2.0.jar
similarity index 95%
rename from common/offline-m2/com/android/databinding/compiler/2.2.0-rc1/compiler-2.2.0-rc1.jar
rename to common/offline-m2/com/android/databinding/compiler/2.2.0/compiler-2.2.0.jar
index 4947e0a..a2662f5 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-rc1/compiler-2.2.0-rc1.jar
+++ b/common/offline-m2/com/android/databinding/compiler/2.2.0/compiler-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta3/compiler-2.2.0-beta3.pom b/common/offline-m2/com/android/databinding/compiler/2.2.0/compiler-2.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/databinding/compiler/2.2.0-beta3/compiler-2.2.0-beta3.pom
rename to common/offline-m2/com/android/databinding/compiler/2.2.0/compiler-2.2.0.pom
index 17545fd..373befd 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta3/compiler-2.2.0-beta3.pom
+++ b/common/offline-m2/com/android/databinding/compiler/2.2.0/compiler-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>compiler</artifactId>
-  <version>2.2.0-beta3</version>
+  <version>2.2.0</version>
   <name>Data Binding Annotation Processor</name>
   <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
   <url>http://tools.android.com</url>
@@ -29,13 +29,13 @@
     <dependency>
       <groupId>com.android.databinding</groupId>
       <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta3</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.databinding</groupId>
       <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-beta3</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0/compilerCommon-2.0.0.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0/compilerCommon-2.0.0.jar
deleted file mode 100644
index 9759d67..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0/compilerCommon-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0/compilerCommon-2.0.0.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0/compilerCommon-2.0.0.pom
deleted file mode 100644
index f980708..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0/compilerCommon-2.0.0.pom
+++ /dev/null

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compilerCommon</artifactId>
-  <version>2.0.0</version>
-  <name>Data Binding Compiler Common</name>
-  <description>Common library that can be shared between different build tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tunnelvisionlabs</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.1.0/compilerCommon-2.1.0.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.1.0/compilerCommon-2.1.0.jar
deleted file mode 100644
index 17a0106..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.1.0/compilerCommon-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.1.0/compilerCommon-2.1.0.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.1.0/compilerCommon-2.1.0.pom
deleted file mode 100644
index 8598b02..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.1.0/compilerCommon-2.1.0.pom
+++ /dev/null

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compilerCommon</artifactId>
-  <version>2.1.0</version>
-  <name>Data Binding Compiler Common</name>
-  <description>Common library that can be shared between different build tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tunnelvisionlabs</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.jar
deleted file mode 100644
index 7a499c0..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.pom
deleted file mode 100644
index 4b71f8e..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compilerCommon</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Data Binding Compiler Common</name>
-  <description>Common library that can be shared between different build tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>24.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.jar
deleted file mode 100644
index 4662c61..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta2/compilerCommon-2.2.0-beta2.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta2/compilerCommon-2.2.0-beta2.jar
deleted file mode 100644
index 82931b0..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta2/compilerCommon-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta2/compilerCommon-2.2.0-beta2.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta2/compilerCommon-2.2.0-beta2.pom
deleted file mode 100644
index 1cab0bd..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta2/compilerCommon-2.2.0-beta2.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compilerCommon</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Data Binding Compiler Common</name>
-  <description>Common library that can be shared between different build tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>24.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta3/compilerCommon-2.2.0-beta3.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta3/compilerCommon-2.2.0-beta3.jar
deleted file mode 100644
index f61e4c2..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta3/compilerCommon-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta3/compilerCommon-2.2.0-beta3.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta3/compilerCommon-2.2.0-beta3.pom
deleted file mode 100644
index 6c29438..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta3/compilerCommon-2.2.0-beta3.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compilerCommon</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Data Binding Compiler Common</name>
-  <description>Common library that can be shared between different build tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>24.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-rc1/compilerCommon-2.2.0-rc1.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-rc1/compilerCommon-2.2.0-rc1.pom
deleted file mode 100644
index 7d3faca..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-rc1/compilerCommon-2.2.0-rc1.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.databinding</groupId>
-  <artifactId>compilerCommon</artifactId>
-  <version>2.2.0-rc1</version>
-  <name>Data Binding Compiler Common</name>
-  <description>Common library that can be shared between different build tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>24.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-rc1/compilerCommon-2.2.0-rc1.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0/compilerCommon-2.2.0.jar
similarity index 92%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.2.0-rc1/compilerCommon-2.2.0-rc1.jar
rename to common/offline-m2/com/android/databinding/compilerCommon/2.2.0/compilerCommon-2.2.0.jar
index 06b1402..352556a 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-rc1/compilerCommon-2.2.0-rc1.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0/compilerCommon-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0/compilerCommon-2.2.0.pom
similarity index 96%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.pom
rename to common/offline-m2/com/android/databinding/compilerCommon/2.2.0/compilerCommon-2.2.0.pom
index 12b9f64..7657f66 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0/compilerCommon-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>compilerCommon</artifactId>
-  <version>2.2.0-beta1</version>
+  <version>2.2.0</version>
   <name>Data Binding Compiler Common</name>
   <description>Common library that can be shared between different build tools</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.databinding</groupId>
       <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-beta1</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.jar
deleted file mode 100644
index 91b7f56..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.pom
deleted file mode 100644
index 3613f89..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>protos</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools Analytics Protobufs</name>
-  <description>Library containing protobufs for usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.jar
deleted file mode 100644
index 015ebdc..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.pom
deleted file mode 100644
index 1d023dc..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>protos</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools Analytics Protobufs</name>
-  <description>Library containing protobufs for usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta2/protos-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta2/protos-25.2.0-beta2.jar
deleted file mode 100644
index 6260778..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta2/protos-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta2/protos-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta2/protos-25.2.0-beta2.pom
deleted file mode 100644
index dc920d0..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta2/protos-25.2.0-beta2.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>protos</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools Analytics Protobufs</name>
-  <description>Library containing protobufs for usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta3/protos-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta3/protos-25.2.0-beta3.jar
deleted file mode 100644
index 7841dad..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta3/protos-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-rc1/protos-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-rc1/protos-25.2.0-rc1.pom
deleted file mode 100644
index 7a082b1..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-rc1/protos-25.2.0-rc1.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>protos</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools Analytics Protobufs</name>
-  <description>Library containing protobufs for usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-rc1/protos-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0/protos-25.2.0.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-rc1/protos-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/analytics-library/protos/25.2.0/protos-25.2.0.jar
index cfa052b..859a309 100644
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-rc1/protos-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0/protos-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta3/protos-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0/protos-25.2.0.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta3/protos-25.2.0-beta3.pom
rename to common/offline-m2/com/android/tools/analytics-library/protos/25.2.0/protos-25.2.0.pom
index 9288809..feb73c3 100644
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta3/protos-25.2.0-beta3.pom
+++ b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0/protos-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.analytics-library</groupId>
   <artifactId>protos</artifactId>
-  <version>25.2.0-beta3</version>
+  <version>25.2.0</version>
   <name>Android Tools Analytics Protobufs</name>
   <description>Library containing protobufs for usage analytics.</description>
   <url>http://tools.android.com</url>

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.jar
deleted file mode 100644
index cc26939..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.pom
deleted file mode 100644
index 8361567..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>shared</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools Analytics Shared Library</name>
-  <description>Helper Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.jar
deleted file mode 100644
index f359fd2..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.pom
deleted file mode 100644
index 5cb5f85..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>shared</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools Analytics Shared Library</name>
-  <description>Helper Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta2/shared-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta2/shared-25.2.0-beta2.jar
deleted file mode 100644
index 250e719..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta2/shared-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta3/shared-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta3/shared-25.2.0-beta3.jar
deleted file mode 100644
index a2ba505..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta3/shared-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta3/shared-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta3/shared-25.2.0-beta3.pom
deleted file mode 100644
index fed24b9..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta3/shared-25.2.0-beta3.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>shared</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools Analytics Shared Library</name>
-  <description>Helper Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-rc1/shared-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-rc1/shared-25.2.0-rc1.pom
deleted file mode 100644
index ad55d41..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-rc1/shared-25.2.0-rc1.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>shared</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools Analytics Shared Library</name>
-  <description>Helper Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-rc1/shared-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0/shared-25.2.0.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-rc1/shared-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/analytics-library/shared/25.2.0/shared-25.2.0.jar
index 43d512f..0ee1842 100644
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-rc1/shared-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0/shared-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta2/shared-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0/shared-25.2.0.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta2/shared-25.2.0-beta2.pom
rename to common/offline-m2/com/android/tools/analytics-library/shared/25.2.0/shared-25.2.0.pom
index 9466f6f..d32deb2 100644
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta2/shared-25.2.0-beta2.pom
+++ b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0/shared-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.analytics-library</groupId>
   <artifactId>shared</artifactId>
-  <version>25.2.0-beta2</version>
+  <version>25.2.0</version>
   <name>Android Tools Analytics Shared Library</name>
   <description>Helper Library for tracking usage analytics.</description>
   <url>http://tools.android.com</url>
@@ -29,19 +29,19 @@
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
       <artifactId>protos</artifactId>
-      <version>25.2.0-beta2</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.2.0-beta2</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
-      <version>25.2.0-beta2</version>
+      <version>25.2.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.jar
deleted file mode 100644
index 5397843..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.pom
deleted file mode 100644
index cb3cd6c..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>tracker</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools Analytics Tracker</name>
-  <description>Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.jar
deleted file mode 100644
index 5b01d63..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.pom
deleted file mode 100644
index 15b8386..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.pom
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>tracker</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools Analytics Tracker</name>
-  <description>Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta2/tracker-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta2/tracker-25.2.0-beta2.jar
deleted file mode 100644
index 49a000b..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta2/tracker-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta2/tracker-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta2/tracker-25.2.0-beta2.pom
deleted file mode 100644
index 13a665c..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta2/tracker-25.2.0-beta2.pom
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>tracker</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools Analytics Tracker</name>
-  <description>Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta3/tracker-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta3/tracker-25.2.0-beta3.pom
deleted file mode 100644
index 98b0ea1..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta3/tracker-25.2.0-beta3.pom
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.analytics-library</groupId>
-  <artifactId>tracker</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools Analytics Tracker</name>
-  <description>Library for tracking usage analytics.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-rc1/tracker-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-rc1/tracker-25.2.0-rc1.jar
deleted file mode 100644
index e5e4b37..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-rc1/tracker-25.2.0-rc1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta3/tracker-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0/tracker-25.2.0.jar
similarity index 89%
rename from common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta3/tracker-25.2.0-beta3.jar
rename to common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0/tracker-25.2.0.jar
index 40775a0..f1eaac2 100644
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta3/tracker-25.2.0-beta3.jar
+++ b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0/tracker-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-rc1/tracker-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0/tracker-25.2.0.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-rc1/tracker-25.2.0-rc1.pom
rename to common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0/tracker-25.2.0.pom
index b7d4f1e..5168f7f 100644
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-rc1/tracker-25.2.0-rc1.pom
+++ b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0/tracker-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.analytics-library</groupId>
   <artifactId>tracker</artifactId>
-  <version>25.2.0-rc1</version>
+  <version>25.2.0</version>
   <name>Android Tools Analytics Tracker</name>
   <description>Library for tracking usage analytics.</description>
   <url>http://tools.android.com</url>
@@ -29,25 +29,25 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
       <artifactId>protos</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
       <artifactId>shared</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0/annotations-25.0.0.jar b/common/offline-m2/com/android/tools/annotations/25.0.0/annotations-25.0.0.jar
deleted file mode 100644
index 46511cf..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.0.0/annotations-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0/annotations-25.0.0.pom b/common/offline-m2/com/android/tools/annotations/25.0.0/annotations-25.0.0.pom
deleted file mode 100644
index 7f8f449..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.0.0/annotations-25.0.0.pom
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>annotations</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools Annotations library</name>
-  <description>annotations used throughout the Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-</project>

diff --git a/common/offline-m2/com/android/tools/annotations/25.1.0/annotations-25.1.0.jar b/common/offline-m2/com/android/tools/annotations/25.1.0/annotations-25.1.0.jar
deleted file mode 100644
index ec4fab3..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.1.0/annotations-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.jar
deleted file mode 100644
index 5a46446..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.pom
deleted file mode 100644
index a332018..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>annotations</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools Annotations library</name>
-  <description>annotations used throughout the Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-</project>

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.jar
deleted file mode 100644
index edacce6..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.pom
deleted file mode 100644
index 16c1b90..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.pom
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>annotations</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools Annotations library</name>
-  <description>annotations used throughout the Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-</project>

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-beta2/annotations-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/annotations/25.2.0-beta2/annotations-25.2.0-beta2.pom
deleted file mode 100644
index 3fe82c0..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-beta2/annotations-25.2.0-beta2.pom
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>annotations</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools Annotations library</name>
-  <description>annotations used throughout the Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-</project>

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-beta3/annotations-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/annotations/25.2.0-beta3/annotations-25.2.0-beta3.jar
deleted file mode 100644
index 9d02088..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-beta3/annotations-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-beta3/annotations-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/annotations/25.2.0-beta3/annotations-25.2.0-beta3.pom
deleted file mode 100644
index c2c0feb..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-beta3/annotations-25.2.0-beta3.pom
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>annotations</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools Annotations library</name>
-  <description>annotations used throughout the Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-</project>

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-rc1/annotations-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/annotations/25.2.0-rc1/annotations-25.2.0-rc1.jar
deleted file mode 100644
index 1e7c79b..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-rc1/annotations-25.2.0-rc1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-rc1/annotations-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/annotations/25.2.0-rc1/annotations-25.2.0-rc1.pom
deleted file mode 100644
index 6e5e0a2..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-rc1/annotations-25.2.0-rc1.pom
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>annotations</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools Annotations library</name>
-  <description>annotations used throughout the Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-</project>

diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-beta2/annotations-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/annotations/25.2.0/annotations-25.2.0.jar
similarity index 80%
rename from common/offline-m2/com/android/tools/annotations/25.2.0-beta2/annotations-25.2.0-beta2.jar
rename to common/offline-m2/com/android/tools/annotations/25.2.0/annotations-25.2.0.jar
index fff1358..36d0a0f 100644
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-beta2/annotations-25.2.0-beta2.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.2.0/annotations-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/annotations/25.1.0/annotations-25.1.0.pom b/common/offline-m2/com/android/tools/annotations/25.2.0/annotations-25.2.0.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/annotations/25.1.0/annotations-25.1.0.pom
rename to common/offline-m2/com/android/tools/annotations/25.2.0/annotations-25.2.0.pom
index dfa8f9b..f20a3e4 100644
--- a/common/offline-m2/com/android/tools/annotations/25.1.0/annotations-25.1.0.pom
+++ b/common/offline-m2/com/android/tools/annotations/25.2.0/annotations-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>annotations</artifactId>
-  <version>25.1.0</version>
+  <version>25.2.0</version>
   <name>Android Tools Annotations library</name>
   <description>annotations used throughout the Android tools libraries.</description>
   <url>http://tools.android.com</url>

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0/builder-model-2.0.0.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0/builder-model-2.0.0.jar
deleted file mode 100644
index 00b6f20..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0/builder-model-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0/builder-model-2.0.0.pom b/common/offline-m2/com/android/tools/build/builder-model/2.0.0/builder-model-2.0.0.pom
deleted file mode 100644
index e3c5fc1..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0/builder-model-2.0.0.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-model</artifactId>
-  <version>2.0.0</version>
-  <name>Android Builder Model library</name>
-  <description>Model for the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.1.0/builder-model-2.1.0.jar b/common/offline-m2/com/android/tools/build/builder-model/2.1.0/builder-model-2.1.0.jar
deleted file mode 100644
index c862ea9..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.1.0/builder-model-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.jar
deleted file mode 100644
index 7060e33..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.pom b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.pom
deleted file mode 100644
index 8f21312..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-model</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Android Builder Model library</name>
-  <description>Model for the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.jar
deleted file mode 100644
index 9297f7b..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.pom
deleted file mode 100644
index ef87f00..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-model</artifactId>
-  <version>2.2.0-beta1</version>
-  <name>Android Builder Model library</name>
-  <description>Model for the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta2/builder-model-2.2.0-beta2.jar b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta2/builder-model-2.2.0-beta2.jar
deleted file mode 100644
index 5ba8fcc..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta2/builder-model-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta2/builder-model-2.2.0-beta2.pom b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta2/builder-model-2.2.0-beta2.pom
deleted file mode 100644
index c057604..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta2/builder-model-2.2.0-beta2.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-model</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Android Builder Model library</name>
-  <description>Model for the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta3/builder-model-2.2.0-beta3.jar b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta3/builder-model-2.2.0-beta3.jar
deleted file mode 100644
index ffe89a6..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta3/builder-model-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta3/builder-model-2.2.0-beta3.pom b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta3/builder-model-2.2.0-beta3.pom
deleted file mode 100644
index c18ccc0..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta3/builder-model-2.2.0-beta3.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-model</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Android Builder Model library</name>
-  <description>Model for the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-rc1/builder-model-2.2.0-rc1.pom b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-rc1/builder-model-2.2.0-rc1.pom
deleted file mode 100644
index 9ee73d3..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-rc1/builder-model-2.2.0-rc1.pom
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-model</artifactId>
-  <version>2.2.0-rc1</version>
-  <name>Android Builder Model library</name>
-  <description>Model for the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-rc1/builder-model-2.2.0-rc1.jar b/common/offline-m2/com/android/tools/build/builder-model/2.2.0/builder-model-2.2.0.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/build/builder-model/2.2.0-rc1/builder-model-2.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/build/builder-model/2.2.0/builder-model-2.2.0.jar
index 9e4a58e..f7d8821 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-rc1/builder-model-2.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.2.0/builder-model-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.1.0/builder-model-2.1.0.pom b/common/offline-m2/com/android/tools/build/builder-model/2.2.0/builder-model-2.2.0.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/build/builder-model/2.1.0/builder-model-2.1.0.pom
rename to common/offline-m2/com/android/tools/build/builder-model/2.2.0/builder-model-2.2.0.pom
index ce3b515..393f8fc 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.1.0/builder-model-2.1.0.pom
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.2.0/builder-model-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-model</artifactId>
-  <version>2.1.0</version>
+  <version>2.2.0</version>
   <name>Android Builder Model library</name>
   <description>Model for the Builder library.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.1.0</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0/builder-test-api-2.0.0.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0/builder-test-api-2.0.0.jar
deleted file mode 100644
index 07f9459..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0/builder-test-api-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0/builder-test-api-2.0.0.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0/builder-test-api-2.0.0.pom
deleted file mode 100644
index dfaadca..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0/builder-test-api-2.0.0.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-test-api</artifactId>
-  <version>2.0.0</version>
-  <name>Android Builder Test API library</name>
-  <description>API for the Test extension point in the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.1.0/builder-test-api-2.1.0.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.1.0/builder-test-api-2.1.0.jar
deleted file mode 100644
index 0e1187e..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.1.0/builder-test-api-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.pom
deleted file mode 100644
index 251f80e..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-test-api</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Android Builder Test API library</name>
-  <description>API for the Test extension point in the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.jar
deleted file mode 100644
index 27430bd..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.pom
deleted file mode 100644
index 469980a..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-test-api</artifactId>
-  <version>2.2.0-beta1</version>
-  <name>Android Builder Test API library</name>
-  <description>API for the Test extension point in the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta2/builder-test-api-2.2.0-beta2.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta2/builder-test-api-2.2.0-beta2.jar
deleted file mode 100644
index 5652bf8..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta2/builder-test-api-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta2/builder-test-api-2.2.0-beta2.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta2/builder-test-api-2.2.0-beta2.pom
deleted file mode 100644
index 8b2fe50..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta2/builder-test-api-2.2.0-beta2.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-test-api</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Android Builder Test API library</name>
-  <description>API for the Test extension point in the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta3/builder-test-api-2.2.0-beta3.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta3/builder-test-api-2.2.0-beta3.jar
deleted file mode 100644
index 6adaffc..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta3/builder-test-api-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta3/builder-test-api-2.2.0-beta3.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta3/builder-test-api-2.2.0-beta3.pom
deleted file mode 100644
index 805b10e..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta3/builder-test-api-2.2.0-beta3.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-test-api</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Android Builder Test API library</name>
-  <description>API for the Test extension point in the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-rc1/builder-test-api-2.2.0-rc1.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-rc1/builder-test-api-2.2.0-rc1.jar
deleted file mode 100644
index 122afbf..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-rc1/builder-test-api-2.2.0-rc1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-rc1/builder-test-api-2.2.0-rc1.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-rc1/builder-test-api-2.2.0-rc1.pom
deleted file mode 100644
index e70001a..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-rc1/builder-test-api-2.2.0-rc1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder-test-api</artifactId>
-  <version>2.2.0-rc1</version>
-  <name>Android Builder Test API library</name>
-  <description>API for the Test extension point in the Builder library.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0/builder-test-api-2.2.0.jar
similarity index 77%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.2.0/builder-test-api-2.2.0.jar
index b9dac35..273de0c 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0/builder-test-api-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.1.0/builder-test-api-2.1.0.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0/builder-test-api-2.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.1.0/builder-test-api-2.1.0.pom
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.2.0/builder-test-api-2.2.0.pom
index 50ba6c7..2590806 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.1.0/builder-test-api-2.1.0.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0/builder-test-api-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-test-api</artifactId>
-  <version>2.1.0</version>
+  <version>2.2.0</version>
   <name>Android Builder Test API library</name>
   <description>API for the Test extension point in the Builder library.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
-      <version>25.1.0</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0/builder-2.0.0.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0/builder-2.0.0.jar
deleted file mode 100644
index d9c8996..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0/builder-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0/builder-2.0.0.pom b/common/offline-m2/com/android/tools/build/builder/2.0.0/builder-2.0.0.pom
deleted file mode 100644
index 7443bff..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0/builder-2.0.0.pom
+++ /dev/null

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder</artifactId>
-  <version>2.0.0</version>
-  <name>Android Builder library</name>
-  <description>Library to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder/2.1.0/builder-2.1.0.jar b/common/offline-m2/com/android/tools/build/builder/2.1.0/builder-2.1.0.jar
deleted file mode 100644
index c823c25..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.1.0/builder-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder/2.1.0/builder-2.1.0.pom b/common/offline-m2/com/android/tools/build/builder/2.1.0/builder-2.1.0.pom
deleted file mode 100644
index 825d264..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.1.0/builder-2.1.0.pom
+++ /dev/null

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder</artifactId>
-  <version>2.1.0</version>
-  <name>Android Builder library</name>
-  <description>Library to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.1.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.jar
deleted file mode 100644
index b887645..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.pom b/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.pom
deleted file mode 100644
index 370d315..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Android Builder library</name>
-  <description>Library to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.11.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>tracker</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.jar
deleted file mode 100644
index cff47f9..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.pom
deleted file mode 100644
index b3c1649..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder</artifactId>
-  <version>2.2.0-beta1</version>
-  <name>Android Builder library</name>
-  <description>Library to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.11.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>tracker</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta2/builder-2.2.0-beta2.jar b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta2/builder-2.2.0-beta2.jar
deleted file mode 100644
index 542d193..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta2/builder-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta2/builder-2.2.0-beta2.pom b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta2/builder-2.2.0-beta2.pom
deleted file mode 100644
index 3f230a7..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta2/builder-2.2.0-beta2.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Android Builder library</name>
-  <description>Library to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.11.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>tracker</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta3/builder-2.2.0-beta3.jar b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta3/builder-2.2.0-beta3.jar
deleted file mode 100644
index f165ad2..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta3/builder-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta3/builder-2.2.0-beta3.pom b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta3/builder-2.2.0-beta3.pom
deleted file mode 100644
index ee0ed19..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta3/builder-2.2.0-beta3.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>builder</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Android Builder library</name>
-  <description>Library to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.11.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>tracker</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-rc1/builder-2.2.0-rc1.jar b/common/offline-m2/com/android/tools/build/builder/2.2.0/builder-2.2.0.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/build/builder/2.2.0-rc1/builder-2.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/build/builder/2.2.0/builder-2.2.0.jar
index 57f8fe0..c638be6 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-rc1/builder-2.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.2.0/builder-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-rc1/builder-2.2.0-rc1.pom b/common/offline-m2/com/android/tools/build/builder/2.2.0/builder-2.2.0.pom
similarity index 90%
rename from common/offline-m2/com/android/tools/build/builder/2.2.0-rc1/builder-2.2.0-rc1.pom
rename to common/offline-m2/com/android/tools/build/builder/2.2.0/builder-2.2.0.pom
index e2593e1..00913d0 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-rc1/builder-2.2.0-rc1.pom
+++ b/common/offline-m2/com/android/tools/build/builder/2.2.0/builder-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder</artifactId>
-  <version>2.2.0-rc1</version>
+  <version>2.2.0</version>
   <name>Android Builder library</name>
   <description>Library to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -29,43 +29,43 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
-      <version>2.2.0-rc1</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-rc1</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>manifest-merger</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -83,19 +83,19 @@
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
       <artifactId>protos</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
       <artifactId>shared</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
       <artifactId>tracker</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -149,7 +149,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0/gradle-api-2.0.0.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0/gradle-api-2.0.0.jar
deleted file mode 100644
index 052d2d2..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0/gradle-api-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0/gradle-api-2.0.0.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0/gradle-api-2.0.0.pom
deleted file mode 100644
index 7c2f5a5..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0/gradle-api-2.0.0.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-api</artifactId>
-  <version>2.0.0</version>
-  <name>Android Gradle API</name>
-  <description>APIs to customize Android Gradle Builds</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.1.0/gradle-api-2.1.0.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.1.0/gradle-api-2.1.0.jar
deleted file mode 100644
index 243cccd..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.1.0/gradle-api-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.1.0/gradle-api-2.1.0.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.1.0/gradle-api-2.1.0.pom
deleted file mode 100644
index 48cde64..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.1.0/gradle-api-2.1.0.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-api</artifactId>
-  <version>2.1.0</version>
-  <name>Android Gradle API</name>
-  <description>APIs to customize Android Gradle Builds</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.pom
deleted file mode 100644
index ff8d83b..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-api</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Android Gradle API</name>
-  <description>APIs to customize Android Gradle Builds</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.jar
deleted file mode 100644
index 3293610..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta2/gradle-api-2.2.0-beta2.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta2/gradle-api-2.2.0-beta2.jar
deleted file mode 100644
index ea1cc3f..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta2/gradle-api-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta2/gradle-api-2.2.0-beta2.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta2/gradle-api-2.2.0-beta2.pom
deleted file mode 100644
index ff99900..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta2/gradle-api-2.2.0-beta2.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-api</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Android Gradle API</name>
-  <description>APIs to customize Android Gradle Builds</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta3/gradle-api-2.2.0-beta3.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta3/gradle-api-2.2.0-beta3.jar
deleted file mode 100644
index 817cc70..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta3/gradle-api-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta3/gradle-api-2.2.0-beta3.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta3/gradle-api-2.2.0-beta3.pom
deleted file mode 100644
index 264fdb4..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta3/gradle-api-2.2.0-beta3.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-api</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Android Gradle API</name>
-  <description>APIs to customize Android Gradle Builds</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-rc1/gradle-api-2.2.0-rc1.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-rc1/gradle-api-2.2.0-rc1.jar
deleted file mode 100644
index 2cb4f65..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-rc1/gradle-api-2.2.0-rc1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-rc1/gradle-api-2.2.0-rc1.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-rc1/gradle-api-2.2.0-rc1.pom
deleted file mode 100644
index 69348a7..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-rc1/gradle-api-2.2.0-rc1.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-api</artifactId>
-  <version>2.2.0-rc1</version>
-  <name>Android Gradle API</name>
-  <description>APIs to customize Android Gradle Builds</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0/gradle-api-2.2.0.jar
similarity index 72%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.jar
rename to common/offline-m2/com/android/tools/build/gradle-api/2.2.0/gradle-api-2.2.0.jar
index 29bf4fe..7ace96c 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0/gradle-api-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0/gradle-api-2.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/gradle-api/2.2.0/gradle-api-2.2.0.pom
index c5a22d0..47c7321 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0/gradle-api-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-api</artifactId>
-  <version>2.2.0-beta1</version>
+  <version>2.2.0</version>
   <name>Android Gradle API</name>
   <description>APIs to customize Android Gradle Builds</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta1</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0/gradle-core-2.0.0.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0/gradle-core-2.0.0.jar
deleted file mode 100644
index 1d9273d..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0/gradle-core-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0/gradle-core-2.0.0.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0/gradle-core-2.0.0.pom
deleted file mode 100644
index ccc4d4a..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0/gradle-core-2.0.0.pom
+++ /dev/null

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-core</artifactId>
-  <version>2.0.0</version>
-  <name>Core Library for Android Gradle Plug-in</name>
-  <description>Core library to build Android Gradle plugin.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.core</artifactId>
-      <version>0.7.4.201502262128</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.1.0/gradle-core-2.1.0.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.1.0/gradle-core-2.1.0.jar
deleted file mode 100644
index b2cc88a..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.1.0/gradle-core-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.1.0/gradle-core-2.1.0.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.1.0/gradle-core-2.1.0.pom
deleted file mode 100644
index 9827261..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.1.0/gradle-core-2.1.0.pom
+++ /dev/null

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-core</artifactId>
-  <version>2.1.0</version>
-  <name>Core Library for Android Gradle Plug-in</name>
-  <description>Core library to build Android Gradle plugin.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.core</artifactId>
-      <version>0.7.4.201502262128</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.1.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.jar
deleted file mode 100644
index b930545..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.pom
deleted file mode 100644
index 93dc753..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-core</artifactId>
-  <version>2.2.0-alpha7</version>
-  <name>Core Library for Android Gradle Plug-in</name>
-  <description>Core library to build Android Gradle plugin.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.core</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.report</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-      <version>4.9</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.6.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.jar
deleted file mode 100644
index ce0b7ce..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.pom
deleted file mode 100644
index 3cfb478..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-core</artifactId>
-  <version>2.2.0-beta1</version>
-  <name>Core Library for Android Gradle Plug-in</name>
-  <description>Core library to build Android Gradle plugin.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.core</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.report</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-      <version>4.9</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.6.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta2/gradle-core-2.2.0-beta2.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta2/gradle-core-2.2.0-beta2.jar
deleted file mode 100644
index 6ea591f..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta2/gradle-core-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta2/gradle-core-2.2.0-beta2.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta2/gradle-core-2.2.0-beta2.pom
deleted file mode 100644
index 2fd0b4b..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta2/gradle-core-2.2.0-beta2.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-core</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Core Library for Android Gradle Plug-in</name>
-  <description>Core library to build Android Gradle plugin.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.core</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.report</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-      <version>4.9</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.6.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta3/gradle-core-2.2.0-beta3.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta3/gradle-core-2.2.0-beta3.jar
deleted file mode 100644
index 0d2f3db..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta3/gradle-core-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta3/gradle-core-2.2.0-beta3.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta3/gradle-core-2.2.0-beta3.pom
deleted file mode 100644
index cfcaf18..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta3/gradle-core-2.2.0-beta3.pom
+++ /dev/null

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-core</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Core Library for Android Gradle Plug-in</name>
-  <description>Core library to build Android Gradle plugin.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.core</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.report</artifactId>
-      <version>0.7.5.201505241946</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-      <version>4.9</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.6.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-rc1/gradle-core-2.2.0-rc1.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0/gradle-core-2.2.0.jar
similarity index 84%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.2.0-rc1/gradle-core-2.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/build/gradle-core/2.2.0/gradle-core-2.2.0.jar
index 1117292..821f4cd 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-rc1/gradle-core-2.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0/gradle-core-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-rc1/gradle-core-2.2.0-rc1.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0/gradle-core-2.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.2.0-rc1/gradle-core-2.2.0-rc1.pom
rename to common/offline-m2/com/android/tools/build/gradle-core/2.2.0/gradle-core-2.2.0.pom
index 6a9da7f..7732c8b 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-rc1/gradle-core-2.2.0-rc1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0/gradle-core-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-core</artifactId>
-  <version>2.2.0-rc1</version>
+  <version>2.2.0</version>
   <name>Core Library for Android Gradle Plug-in</name>
   <description>Core library to build Android Gradle plugin.</description>
   <url>http://tools.android.com</url>
@@ -29,13 +29,13 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder</artifactId>
-      <version>2.2.0-rc1</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -47,13 +47,13 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>gradle-api</artifactId>
-      <version>2.2.0-rc1</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.databinding</groupId>
       <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-rc1</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -143,7 +143,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0/gradle-experimental-0.6.0.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0/gradle-experimental-0.6.0.jar
deleted file mode 100644
index 2f7a984..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0/gradle-experimental-0.6.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0/gradle-experimental-0.6.0.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0/gradle-experimental-0.6.0.pom
deleted file mode 100644
index fe3b254..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0/gradle-experimental-0.6.0.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-experimental</artifactId>
-  <version>0.6.0</version>
-  <name>Gradle Plug-in for Android Using Component Model</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.7.0/gradle-experimental-0.7.0.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.7.0/gradle-experimental-0.7.0.jar
deleted file mode 100644
index 83013df..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.7.0/gradle-experimental-0.7.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.jar
deleted file mode 100644
index 0d54501..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.pom
deleted file mode 100644
index e270ec8..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-experimental</artifactId>
-  <version>0.8.0-alpha7</version>
-  <name>Gradle Plug-in for Android Using Component Model</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.jar
deleted file mode 100644
index fab8ece..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.pom
deleted file mode 100644
index c0f9774..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-experimental</artifactId>
-  <version>0.8.0-beta1</version>
-  <name>Gradle Plug-in for Android Using Component Model</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta2/gradle-experimental-0.8.0-beta2.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta2/gradle-experimental-0.8.0-beta2.jar
deleted file mode 100644
index a54d698..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta2/gradle-experimental-0.8.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta2/gradle-experimental-0.8.0-beta2.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta2/gradle-experimental-0.8.0-beta2.pom
deleted file mode 100644
index b6bff10..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta2/gradle-experimental-0.8.0-beta2.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-experimental</artifactId>
-  <version>0.8.0-beta2</version>
-  <name>Gradle Plug-in for Android Using Component Model</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta3/gradle-experimental-0.8.0-beta3.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta3/gradle-experimental-0.8.0-beta3.jar
deleted file mode 100644
index c63c541..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta3/gradle-experimental-0.8.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta3/gradle-experimental-0.8.0-beta3.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta3/gradle-experimental-0.8.0-beta3.pom
deleted file mode 100644
index fc3575c..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta3/gradle-experimental-0.8.0-beta3.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-experimental</artifactId>
-  <version>0.8.0-beta3</version>
-  <name>Gradle Plug-in for Android Using Component Model</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-rc1/gradle-experimental-0.8.0-rc1.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-rc1/gradle-experimental-0.8.0-rc1.pom
deleted file mode 100644
index bc27f0d..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-rc1/gradle-experimental-0.8.0-rc1.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle-experimental</artifactId>
-  <version>0.8.0-rc1</version>
-  <name>Gradle Plug-in for Android Using Component Model</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-rc1/gradle-experimental-0.8.0-rc1.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0/gradle-experimental-0.8.0.jar
similarity index 86%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-rc1/gradle-experimental-0.8.0-rc1.jar
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0/gradle-experimental-0.8.0.jar
index ef6004b..555ce67 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-rc1/gradle-experimental-0.8.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0/gradle-experimental-0.8.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.7.0/gradle-experimental-0.7.0.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0/gradle-experimental-0.8.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.7.0/gradle-experimental-0.7.0.pom
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0/gradle-experimental-0.8.0.pom
index fa1454d..f0a49fbf 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.7.0/gradle-experimental-0.7.0.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0/gradle-experimental-0.8.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-experimental</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
   <name>Gradle Plug-in for Android Using Component Model</name>
   <description>Gradle plug-in to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,15 +27,9 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>gradle-core</artifactId>
-      <version>2.1.0</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -44,5 +38,11 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0/gradle-2.0.0.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0/gradle-2.0.0.jar
deleted file mode 100644
index b5b84fa..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0/gradle-2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0/gradle-2.0.0.pom b/common/offline-m2/com/android/tools/build/gradle/2.0.0/gradle-2.0.0.pom
deleted file mode 100644
index 08d811d..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0/gradle-2.0.0.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle</artifactId>
-  <version>2.0.0</version>
-  <name>Gradle Plug-in for Android</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.1.0/gradle-2.1.0.jar b/common/offline-m2/com/android/tools/build/gradle/2.1.0/gradle-2.1.0.jar
deleted file mode 100644
index 8a69fd2..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.1.0/gradle-2.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.1.0/gradle-2.1.0.pom b/common/offline-m2/com/android/tools/build/gradle/2.1.0/gradle-2.1.0.pom
deleted file mode 100644
index e250e3c..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.1.0/gradle-2.1.0.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle</artifactId>
-  <version>2.1.0</version>
-  <name>Gradle Plug-in for Android</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.jar
deleted file mode 100644
index f7c9c45..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.pom
deleted file mode 100644
index 38a8679..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle</artifactId>
-  <version>2.2.0-beta1</version>
-  <name>Gradle Plug-in for Android</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta2/gradle-2.2.0-beta2.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta2/gradle-2.2.0-beta2.jar
deleted file mode 100644
index 42c2ce8..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta2/gradle-2.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta2/gradle-2.2.0-beta2.pom b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta2/gradle-2.2.0-beta2.pom
deleted file mode 100644
index 27908ca..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta2/gradle-2.2.0-beta2.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle</artifactId>
-  <version>2.2.0-beta2</version>
-  <name>Gradle Plug-in for Android</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta3/gradle-2.2.0-beta3.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta3/gradle-2.2.0-beta3.jar
deleted file mode 100644
index b238010..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta3/gradle-2.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta3/gradle-2.2.0-beta3.pom b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta3/gradle-2.2.0-beta3.pom
deleted file mode 100644
index 957a4c2..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta3/gradle-2.2.0-beta3.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle</artifactId>
-  <version>2.2.0-beta3</version>
-  <name>Gradle Plug-in for Android</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-rc1/gradle-2.2.0-rc1.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0-rc1/gradle-2.2.0-rc1.jar
deleted file mode 100644
index 438f562..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-rc1/gradle-2.2.0-rc1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-rc1/gradle-2.2.0-rc1.pom b/common/offline-m2/com/android/tools/build/gradle/2.2.0-rc1/gradle-2.2.0-rc1.pom
deleted file mode 100644
index b867afc..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-rc1/gradle-2.2.0-rc1.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>gradle</artifactId>
-  <version>2.2.0-rc1</version>
-  <name>Gradle Plug-in for Android</name>
-  <description>Gradle plug-in to build Android applications.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0/gradle-2.2.0.jar
similarity index 71%
rename from common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/gradle/2.2.0/gradle-2.2.0.jar
index a1c7b5c..cd85e6c 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.2.0/gradle-2.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.pom b/common/offline-m2/com/android/tools/build/gradle/2.2.0/gradle-2.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.pom
rename to common/offline-m2/com/android/tools/build/gradle/2.2.0/gradle-2.2.0.pom
index 89c13dc..a11ba9a 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/2.2.0/gradle-2.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle</artifactId>
-  <version>2.2.0-alpha7</version>
+  <version>2.2.0</version>
   <name>Gradle Plug-in for Android</name>
   <description>Gradle plug-in to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>gradle-core</artifactId>
-      <version>2.2.0-alpha7</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0/manifest-merger-25.0.0.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0/manifest-merger-25.0.0.jar
deleted file mode 100644
index 1905320..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0/manifest-merger-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0/manifest-merger-25.0.0.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0/manifest-merger-25.0.0.pom
deleted file mode 100644
index 16782be..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0/manifest-merger-25.0.0.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>manifest-merger</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools Manifest Merger library</name>
-  <description>A Library to merge Android manifests.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.1.0/manifest-merger-25.1.0.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.1.0/manifest-merger-25.1.0.jar
deleted file mode 100644
index 165ac21..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.1.0/manifest-merger-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.jar
deleted file mode 100644
index f11ec6a..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.pom
deleted file mode 100644
index 47a728c..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>manifest-merger</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools Manifest Merger library</name>
-  <description>A Library to merge Android manifests.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.jar
deleted file mode 100644
index e64608f..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.pom
deleted file mode 100644
index 6686496..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>manifest-merger</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools Manifest Merger library</name>
-  <description>A Library to merge Android manifests.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta2/manifest-merger-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta2/manifest-merger-25.2.0-beta2.jar
deleted file mode 100644
index f7a6265..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta2/manifest-merger-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta2/manifest-merger-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta2/manifest-merger-25.2.0-beta2.pom
deleted file mode 100644
index ede42f3..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta2/manifest-merger-25.2.0-beta2.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>manifest-merger</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools Manifest Merger library</name>
-  <description>A Library to merge Android manifests.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta3/manifest-merger-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta3/manifest-merger-25.2.0-beta3.jar
deleted file mode 100644
index b61d459..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta3/manifest-merger-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta3/manifest-merger-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta3/manifest-merger-25.2.0-beta3.pom
deleted file mode 100644
index 55bc003..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta3/manifest-merger-25.2.0-beta3.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>manifest-merger</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools Manifest Merger library</name>
-  <description>A Library to merge Android manifests.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-rc1/manifest-merger-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-rc1/manifest-merger-25.2.0-rc1.pom
deleted file mode 100644
index 0cd077f..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-rc1/manifest-merger-25.2.0-rc1.pom
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.build</groupId>
-  <artifactId>manifest-merger</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools Manifest Merger library</name>
-  <description>A Library to merge Android manifests.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-rc1/manifest-merger-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0/manifest-merger-25.2.0.jar
similarity index 79%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-rc1/manifest-merger-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.2.0/manifest-merger-25.2.0.jar
index 600d126..c07a8ac 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-rc1/manifest-merger-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0/manifest-merger-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.1.0/manifest-merger-25.1.0.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0/manifest-merger-25.2.0.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.1.0/manifest-merger-25.1.0.pom
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.2.0/manifest-merger-25.2.0.pom
index 273f97e..1732785 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.1.0/manifest-merger-25.1.0.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0/manifest-merger-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>manifest-merger</artifactId>
-  <version>25.1.0</version>
+  <version>25.2.0</version>
   <name>Android Tools Manifest Merger library</name>
   <description>A Library to merge Android manifests.</description>
   <url>http://tools.android.com</url>
@@ -28,8 +28,20 @@
   <dependencies>
     <dependency>
       <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>25.1.0</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -39,21 +51,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.1.0</version>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.2.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -63,10 +63,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

diff --git a/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar b/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar
index 51c3c66..0e8d541 100644
--- a/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar
+++ b/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.0.0/common-25.0.0.jar b/common/offline-m2/com/android/tools/common/25.0.0/common-25.0.0.jar
deleted file mode 100644
index 84669a4..0000000
--- a/common/offline-m2/com/android/tools/common/25.0.0/common-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.0.0/common-25.0.0.pom b/common/offline-m2/com/android/tools/common/25.0.0/common-25.0.0.pom
deleted file mode 100644
index 348c5a8..0000000
--- a/common/offline-m2/com/android/tools/common/25.0.0/common-25.0.0.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>common</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools common library</name>
-  <description>common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/common/25.1.0/common-25.1.0.jar b/common/offline-m2/com/android/tools/common/25.1.0/common-25.1.0.jar
deleted file mode 100644
index fa1fdb9..0000000
--- a/common/offline-m2/com/android/tools/common/25.1.0/common-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.1.0/common-25.1.0.pom b/common/offline-m2/com/android/tools/common/25.1.0/common-25.1.0.pom
deleted file mode 100644
index dfc33d3..0000000
--- a/common/offline-m2/com/android/tools/common/25.1.0/common-25.1.0.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>common</artifactId>
-  <version>25.1.0</version>
-  <name>Android Tools common library</name>
-  <description>common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.jar
deleted file mode 100644
index 9c78c69..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.pom
deleted file mode 100644
index a7daafd..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>common</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools common library</name>
-  <description>common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.jar
deleted file mode 100644
index bf06051..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.pom
deleted file mode 100644
index d69085c..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>common</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools common library</name>
-  <description>common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>18.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-beta2/common-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/common/25.2.0-beta2/common-25.2.0-beta2.jar
deleted file mode 100644
index d49a333..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta2/common-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-beta2/common-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/common/25.2.0-beta2/common-25.2.0-beta2.pom
deleted file mode 100644
index 2806275..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta2/common-25.2.0-beta2.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>common</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools common library</name>
-  <description>common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>18.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-beta3/common-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/common/25.2.0-beta3/common-25.2.0-beta3.jar
deleted file mode 100644
index 1b719c1..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta3/common-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-beta3/common-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/common/25.2.0-beta3/common-25.2.0-beta3.pom
deleted file mode 100644
index 43b8ace..0000000
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta3/common-25.2.0-beta3.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>common</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools common library</name>
-  <description>common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>18.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-rc1/common-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/common/25.2.0/common-25.2.0.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/common/25.2.0-rc1/common-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/common/25.2.0/common-25.2.0.jar
index c52eb92..189004e 100644
--- a/common/offline-m2/com/android/tools/common/25.2.0-rc1/common-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/common/25.2.0/common-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/common/25.2.0-rc1/common-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/common/25.2.0/common-25.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/common/25.2.0-rc1/common-25.2.0-rc1.pom
rename to common/offline-m2/com/android/tools/common/25.2.0/common-25.2.0.pom
index e766e5f..8216ea2 100644
--- a/common/offline-m2/com/android/tools/common/25.2.0-rc1/common-25.2.0-rc1.pom
+++ b/common/offline-m2/com/android/tools/common/25.2.0/common-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>common</artifactId>
-  <version>25.2.0-rc1</version>
+  <version>25.2.0</version>
   <name>Android Tools common library</name>
   <description>common library used by other Android tools libraries.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.2.0-rc1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0/ddmlib-25.0.0.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0/ddmlib-25.0.0.jar
deleted file mode 100644
index 2ee02b4..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0/ddmlib-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0/ddmlib-25.0.0.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0/ddmlib-25.0.0.pom
deleted file mode 100644
index 98c5fd5..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0/ddmlib-25.0.0.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.ddms</groupId>
-  <artifactId>ddmlib</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools ddmlib</name>
-  <description>Library providing APIs to talk to Android devices</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.1.0/ddmlib-25.1.0.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.1.0/ddmlib-25.1.0.jar
deleted file mode 100644
index d058680..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.1.0/ddmlib-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.jar
deleted file mode 100644
index 93a841c..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.pom
deleted file mode 100644
index def79bc..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.ddms</groupId>
-  <artifactId>ddmlib</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools ddmlib</name>
-  <description>Library providing APIs to talk to Android devices</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.jar
deleted file mode 100644
index 3d27b0b..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.pom
deleted file mode 100644
index 432a02e..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.ddms</groupId>
-  <artifactId>ddmlib</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools ddmlib</name>
-  <description>Library providing APIs to talk to Android devices</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta2/ddmlib-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta2/ddmlib-25.2.0-beta2.jar
deleted file mode 100644
index efed37b..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta2/ddmlib-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta2/ddmlib-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta2/ddmlib-25.2.0-beta2.pom
deleted file mode 100644
index 97ec777..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta2/ddmlib-25.2.0-beta2.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.ddms</groupId>
-  <artifactId>ddmlib</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools ddmlib</name>
-  <description>Library providing APIs to talk to Android devices</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta3/ddmlib-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta3/ddmlib-25.2.0-beta3.jar
deleted file mode 100644
index 30d51b1..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta3/ddmlib-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta3/ddmlib-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta3/ddmlib-25.2.0-beta3.pom
deleted file mode 100644
index 8d19df2..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta3/ddmlib-25.2.0-beta3.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.ddms</groupId>
-  <artifactId>ddmlib</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools ddmlib</name>
-  <description>Library providing APIs to talk to Android devices</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-rc1/ddmlib-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-rc1/ddmlib-25.2.0-rc1.pom
deleted file mode 100644
index 4d924f1..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-rc1/ddmlib-25.2.0-rc1.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.ddms</groupId>
-  <artifactId>ddmlib</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools ddmlib</name>
-  <description>Library providing APIs to talk to Android devices</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-rc1/ddmlib-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0/ddmlib-25.2.0.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-rc1/ddmlib-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0/ddmlib-25.2.0.jar
index 3c3ca91..bb2106a 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-rc1/ddmlib-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0/ddmlib-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.1.0/ddmlib-25.1.0.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0/ddmlib-25.2.0.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.1.0/ddmlib-25.1.0.pom
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0/ddmlib-25.2.0.pom
index d5875cc..6f2d9fa 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.1.0/ddmlib-25.1.0.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0/ddmlib-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.ddms</groupId>
   <artifactId>ddmlib</artifactId>
-  <version>25.1.0</version>
+  <version>25.2.0</version>
   <name>Android Tools ddmlib</name>
   <description>Library providing APIs to talk to Android devices</description>
   <url>http://tools.android.com</url>
@@ -27,16 +27,22 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sf.kxml</groupId>
       <artifactId>kxml2</artifactId>
       <version>2.3.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -44,11 +50,5 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0/dvlib-25.0.0.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0/dvlib-25.0.0.jar
deleted file mode 100644
index 6ed1e32..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0/dvlib-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0/dvlib-25.0.0.pom b/common/offline-m2/com/android/tools/dvlib/25.0.0/dvlib-25.0.0.pom
deleted file mode 100644
index e629fd0..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0/dvlib-25.0.0.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>dvlib</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools dvlib</name>
-  <description>A Library to manage the Android device database XML files.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/dvlib/25.1.0/dvlib-25.1.0.jar b/common/offline-m2/com/android/tools/dvlib/25.1.0/dvlib-25.1.0.jar
deleted file mode 100644
index ff4c0a8..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.1.0/dvlib-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.jar
deleted file mode 100644
index 3555bdc..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.pom
deleted file mode 100644
index 6f545b4..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>dvlib</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools dvlib</name>
-  <description>A Library to manage the Android device database XML files.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.jar
deleted file mode 100644
index ced8c7a..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.pom
deleted file mode 100644
index 92bf8b3..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>dvlib</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools dvlib</name>
-  <description>A Library to manage the Android device database XML files.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta2/dvlib-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta2/dvlib-25.2.0-beta2.jar
deleted file mode 100644
index 86c4f3f..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta2/dvlib-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta2/dvlib-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta2/dvlib-25.2.0-beta2.pom
deleted file mode 100644
index 45ae76c..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta2/dvlib-25.2.0-beta2.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>dvlib</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools dvlib</name>
-  <description>A Library to manage the Android device database XML files.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta3/dvlib-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta3/dvlib-25.2.0-beta3.jar
deleted file mode 100644
index d483a59..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta3/dvlib-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta3/dvlib-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta3/dvlib-25.2.0-beta3.pom
deleted file mode 100644
index 76c0331..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta3/dvlib-25.2.0-beta3.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>dvlib</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools dvlib</name>
-  <description>A Library to manage the Android device database XML files.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-rc1/dvlib-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0-rc1/dvlib-25.2.0-rc1.pom
deleted file mode 100644
index d240fd0..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-rc1/dvlib-25.2.0-rc1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>dvlib</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools dvlib</name>
-  <description>A Library to manage the Android device database XML files.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-rc1/dvlib-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/dvlib/25.2.0/dvlib-25.2.0.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/25.2.0-rc1/dvlib-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/dvlib/25.2.0/dvlib-25.2.0.jar
index 1f37fe8..4c72fcf 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-rc1/dvlib-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.2.0/dvlib-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/dvlib/25.1.0/dvlib-25.1.0.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0/dvlib-25.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/dvlib/25.1.0/dvlib-25.1.0.pom
rename to common/offline-m2/com/android/tools/dvlib/25.2.0/dvlib-25.2.0.pom
index 15e521e..be7ae9e 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.1.0/dvlib-25.1.0.pom
+++ b/common/offline-m2/com/android/tools/dvlib/25.2.0/dvlib-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>dvlib</artifactId>
-  <version>25.1.0</version>
+  <version>25.2.0</version>
   <name>Android Tools dvlib</name>
   <description>A Library to manage the Android device database XML files.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>25.1.0</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.0.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.0.jar
index d9aec7f..360dc5c 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.0.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar b/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar
index ec41064..efff809 100644
--- a/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar
+++ b/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0/layoutlib-api-25.0.0.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0/layoutlib-api-25.0.0.jar
deleted file mode 100644
index 4463ef8..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0/layoutlib-api-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.1.0/layoutlib-api-25.1.0.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.1.0/layoutlib-api-25.1.0.jar
deleted file mode 100644
index 312ddb2..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.1.0/layoutlib-api-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.1.0/layoutlib-api-25.1.0.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.1.0/layoutlib-api-25.1.0.pom
deleted file mode 100644
index 54f8195..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.1.0/layoutlib-api-25.1.0.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.layoutlib</groupId>
-  <artifactId>layoutlib-api</artifactId>
-  <version>25.1.0</version>
-  <name>Android Tools layoutlib-api</name>
-  <description>Library to use the rendering library for Android layouts: layoutlib</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.jar
deleted file mode 100644
index 4b1f9e3..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.pom
deleted file mode 100644
index 89be7bf..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.layoutlib</groupId>
-  <artifactId>layoutlib-api</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools layoutlib-api</name>
-  <description>Library to use the rendering library for Android layouts: layoutlib</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.jar
deleted file mode 100644
index f5c05b4..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.pom
deleted file mode 100644
index 6e0a70a..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.layoutlib</groupId>
-  <artifactId>layoutlib-api</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools layoutlib-api</name>
-  <description>Library to use the rendering library for Android layouts: layoutlib</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta2/layoutlib-api-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta2/layoutlib-api-25.2.0-beta2.jar
deleted file mode 100644
index 945c575..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta2/layoutlib-api-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta2/layoutlib-api-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta2/layoutlib-api-25.2.0-beta2.pom
deleted file mode 100644
index 706c082..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta2/layoutlib-api-25.2.0-beta2.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.layoutlib</groupId>
-  <artifactId>layoutlib-api</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools layoutlib-api</name>
-  <description>Library to use the rendering library for Android layouts: layoutlib</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta3/layoutlib-api-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta3/layoutlib-api-25.2.0-beta3.jar
deleted file mode 100644
index baeb719..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta3/layoutlib-api-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta3/layoutlib-api-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta3/layoutlib-api-25.2.0-beta3.pom
deleted file mode 100644
index a112efa..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta3/layoutlib-api-25.2.0-beta3.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.layoutlib</groupId>
-  <artifactId>layoutlib-api</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools layoutlib-api</name>
-  <description>Library to use the rendering library for Android layouts: layoutlib</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-rc1/layoutlib-api-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-rc1/layoutlib-api-25.2.0-rc1.pom
deleted file mode 100644
index aa5afb8..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-rc1/layoutlib-api-25.2.0-rc1.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.layoutlib</groupId>
-  <artifactId>layoutlib-api</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools layoutlib-api</name>
-  <description>Library to use the rendering library for Android layouts: layoutlib</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-rc1/layoutlib-api-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0/layoutlib-api-25.2.0.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-rc1/layoutlib-api-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0/layoutlib-api-25.2.0.jar
index 19f28b7..8cb803a 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-rc1/layoutlib-api-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0/layoutlib-api-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0/layoutlib-api-25.0.0.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0/layoutlib-api-25.2.0.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0/layoutlib-api-25.0.0.pom
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0/layoutlib-api-25.2.0.pom
index 49f8619..2a228e1 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0/layoutlib-api-25.0.0.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0/layoutlib-api-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.layoutlib</groupId>
   <artifactId>layoutlib-api</artifactId>
-  <version>25.0.0</version>
+  <version>25.2.0</version>
   <name>Android Tools layoutlib-api</name>
   <description>Library to use the rendering library for Android layouts: layoutlib</description>
   <url>http://tools.android.com</url>
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sf.kxml</groupId>
       <artifactId>kxml2</artifactId>
       <version>2.3.0</version>
@@ -34,14 +40,14 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0</version>
+      <artifactId>annotations</artifactId>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
+      <groupId>com.intellij</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.0.0</version>
+      <version>12.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -50,11 +56,5 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0/lint-api-25.0.0.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0/lint-api-25.0.0.jar
deleted file mode 100644
index a32e8e9..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0/lint-api-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0/lint-api-25.0.0.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0/lint-api-25.0.0.pom
deleted file mode 100644
index 8360913..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0/lint-api-25.0.0.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-api</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools Lint API</name>
-  <description>API to build lint checks</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.lombok</groupId>
-      <artifactId>lombok-ast</artifactId>
-      <version>0.2.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.1.0/lint-api-25.1.0.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.1.0/lint-api-25.1.0.jar
deleted file mode 100644
index f42e1cd..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.1.0/lint-api-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.1.0/lint-api-25.1.0.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.1.0/lint-api-25.1.0.pom
deleted file mode 100644
index fc9ab42..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.1.0/lint-api-25.1.0.pom
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-api</artifactId>
-  <version>25.1.0</version>
-  <name>Android Tools Lint API</name>
-  <description>API to build lint checks</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.lombok</groupId>
-      <artifactId>lombok-ast</artifactId>
-      <version>0.2.3</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.jar
deleted file mode 100644
index 8a12bba..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.jar
deleted file mode 100644
index a008b18..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.pom
deleted file mode 100644
index 06d5d93..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.pom
+++ /dev/null

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-api</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools Lint API</name>
-  <description>API to build lint checks</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.lombok</groupId>
-      <artifactId>lombok-ast</artifactId>
-      <version>0.2.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.com-intellij</groupId>
-      <artifactId>uast</artifactId>
-      <version>145.597.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta2/lint-api-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta2/lint-api-25.2.0-beta2.jar
deleted file mode 100644
index 10301b3..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta2/lint-api-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta2/lint-api-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta2/lint-api-25.2.0-beta2.pom
deleted file mode 100644
index fd8934f..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta2/lint-api-25.2.0-beta2.pom
+++ /dev/null

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-api</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools Lint API</name>
-  <description>API to build lint checks</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.lombok</groupId>
-      <artifactId>lombok-ast</artifactId>
-      <version>0.2.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.com-intellij</groupId>
-      <artifactId>uast</artifactId>
-      <version>145.597.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta3/lint-api-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta3/lint-api-25.2.0-beta3.jar
deleted file mode 100644
index 9ed92a2..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta3/lint-api-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta3/lint-api-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta3/lint-api-25.2.0-beta3.pom
deleted file mode 100644
index bfd31c8..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta3/lint-api-25.2.0-beta3.pom
+++ /dev/null

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-api</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools Lint API</name>
-  <description>API to build lint checks</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.lombok</groupId>
-      <artifactId>lombok-ast</artifactId>
-      <version>0.2.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.com-intellij</groupId>
-      <artifactId>uast</artifactId>
-      <version>145.597.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-rc1/lint-api-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-rc1/lint-api-25.2.0-rc1.pom
deleted file mode 100644
index 4dc0961..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-rc1/lint-api-25.2.0-rc1.pom
+++ /dev/null

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-api</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools Lint API</name>
-  <description>API to build lint checks</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.lombok</groupId>
-      <artifactId>lombok-ast</artifactId>
-      <version>0.2.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.com-intellij</groupId>
-      <artifactId>uast</artifactId>
-      <version>145.597.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-rc1/lint-api-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0/lint-api-25.2.0.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.2.0-rc1/lint-api-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/25.2.0/lint-api-25.2.0.jar
index 050cb7e..6068368 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-rc1/lint-api-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0/lint-api-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0/lint-api-25.2.0.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.pom
rename to common/offline-m2/com/android/tools/lint/lint-api/25.2.0/lint-api-25.2.0.pom
index a67b1ad..026bdc8 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0/lint-api-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-api</artifactId>
-  <version>25.2.0-alpha7</version>
+  <version>25.2.0</version>
   <name>Android Tools Lint API</name>
   <description>API to build lint checks</description>
   <url>http://tools.android.com</url>
@@ -29,13 +29,13 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>25.2.0-alpha7</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha7</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0/lint-checks-25.0.0.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0/lint-checks-25.0.0.jar
deleted file mode 100644
index f513f3f..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0/lint-checks-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0/lint-checks-25.0.0.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0/lint-checks-25.0.0.pom
deleted file mode 100644
index 825870f..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0/lint-checks-25.0.0.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-checks</artifactId>
-  <version>25.0.0</version>
-  <name>Android Lint Checks</name>
-  <description>Checks for Android Lint</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.1.0/lint-checks-25.1.0.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.1.0/lint-checks-25.1.0.jar
deleted file mode 100644
index 4bc6d24..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.1.0/lint-checks-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.1.0/lint-checks-25.1.0.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.1.0/lint-checks-25.1.0.pom
deleted file mode 100644
index 8cf606d..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.1.0/lint-checks-25.1.0.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-checks</artifactId>
-  <version>25.1.0</version>
-  <name>Android Lint Checks</name>
-  <description>Checks for Android Lint</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.jar
deleted file mode 100644
index dd029a2..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.jar
deleted file mode 100644
index fc290f7..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.pom
deleted file mode 100644
index 68d7fb6..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-checks</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Lint Checks</name>
-  <description>Checks for Android Lint</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta2/lint-checks-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta2/lint-checks-25.2.0-beta2.jar
deleted file mode 100644
index cab5e35..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta2/lint-checks-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta2/lint-checks-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta2/lint-checks-25.2.0-beta2.pom
deleted file mode 100644
index 835c766..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta2/lint-checks-25.2.0-beta2.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-checks</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Lint Checks</name>
-  <description>Checks for Android Lint</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta3/lint-checks-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta3/lint-checks-25.2.0-beta3.jar
deleted file mode 100644
index e08a7fa..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta3/lint-checks-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta3/lint-checks-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta3/lint-checks-25.2.0-beta3.pom
deleted file mode 100644
index 3ba91cd..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta3/lint-checks-25.2.0-beta3.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-checks</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Lint Checks</name>
-  <description>Checks for Android Lint</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-rc1/lint-checks-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-rc1/lint-checks-25.2.0-rc1.pom
deleted file mode 100644
index f526dc7..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-rc1/lint-checks-25.2.0-rc1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint-checks</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Lint Checks</name>
-  <description>Checks for Android Lint</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-rc1/lint-checks-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0/lint-checks-25.2.0.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-rc1/lint-checks-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.2.0/lint-checks-25.2.0.jar
index 5fd376a..ead97ce 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-rc1/lint-checks-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0/lint-checks-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0/lint-checks-25.2.0.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.pom
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.2.0/lint-checks-25.2.0.pom
index b56d613..9857a37 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0/lint-checks-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-checks</artifactId>
-  <version>25.2.0-alpha7</version>
+  <version>25.2.0</version>
   <name>Android Lint Checks</name>
   <description>Checks for Android Lint</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-api</artifactId>
-      <version>25.2.0-alpha7</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0/lint-25.0.0.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0/lint-25.0.0.jar
deleted file mode 100644
index 2dfdeeb..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0/lint-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0/lint-25.0.0.pom b/common/offline-m2/com/android/tools/lint/lint/25.0.0/lint-25.0.0.pom
deleted file mode 100644
index 74b66cc..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0/lint-25.0.0.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint</artifactId>
-  <version>25.0.0</version>
-  <name>Android Lint Tool</name>
-  <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-      <version>4.4.2</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.1.0/lint-25.1.0.jar b/common/offline-m2/com/android/tools/lint/lint/25.1.0/lint-25.1.0.jar
deleted file mode 100644
index 5c885be..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.1.0/lint-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.1.0/lint-25.1.0.pom b/common/offline-m2/com/android/tools/lint/lint/25.1.0/lint-25.1.0.pom
deleted file mode 100644
index 31ecf63..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.1.0/lint-25.1.0.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint</artifactId>
-  <version>25.1.0</version>
-  <name>Android Lint Tool</name>
-  <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-      <version>4.4.2</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.jar
deleted file mode 100644
index aa6e2d5..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.pom
deleted file mode 100644
index b21a497..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Lint Tool</name>
-  <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-      <version>4.5.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.jar
deleted file mode 100644
index 75ed0d6..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.pom
deleted file mode 100644
index fae05b1..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Lint Tool</name>
-  <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-      <version>4.5.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta2/lint-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta2/lint-25.2.0-beta2.jar
deleted file mode 100644
index 220bad5..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta2/lint-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta3/lint-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta3/lint-25.2.0-beta3.jar
deleted file mode 100644
index 04bfdc1..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta3/lint-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta3/lint-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta3/lint-25.2.0-beta3.pom
deleted file mode 100644
index 6d8ee39..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta3/lint-25.2.0-beta3.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Lint Tool</name>
-  <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-      <version>4.5.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-rc1/lint-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/lint/lint/25.2.0-rc1/lint-25.2.0-rc1.pom
deleted file mode 100644
index e1c1fa6..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-rc1/lint-25.2.0-rc1.pom
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools.lint</groupId>
-  <artifactId>lint</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Lint Tool</name>
-  <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-      <version>4.5.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-rc1/lint-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/lint/lint/25.2.0/lint-25.2.0.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint/25.2.0-rc1/lint-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/lint/lint/25.2.0/lint-25.2.0.jar
index b41768e..1bd9158 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-rc1/lint-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.2.0/lint-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta2/lint-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/lint/lint/25.2.0/lint-25.2.0.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/25.2.0-beta2/lint-25.2.0-beta2.pom
rename to common/offline-m2/com/android/tools/lint/lint/25.2.0/lint-25.2.0.pom
index ef66fb6..1988a55 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta2/lint-25.2.0-beta2.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/25.2.0/lint-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint</artifactId>
-  <version>25.2.0-beta2</version>
+  <version>25.2.0</version>
   <name>Android Lint Tool</name>
   <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-checks</artifactId>
-      <version>25.2.0-beta2</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/repository/25.0.0/repository-25.0.0.jar b/common/offline-m2/com/android/tools/repository/25.0.0/repository-25.0.0.jar
deleted file mode 100644
index 2cc2d53..0000000
--- a/common/offline-m2/com/android/tools/repository/25.0.0/repository-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/repository/25.0.0/repository-25.0.0.pom b/common/offline-m2/com/android/tools/repository/25.0.0/repository-25.0.0.pom
deleted file mode 100644
index 36e09e8..0000000
--- a/common/offline-m2/com/android/tools/repository/25.0.0/repository-25.0.0.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>repository</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools repository</name>
-  <description>A library for downloading and managing package repositories</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/repository/25.1.0/repository-25.1.0.jar b/common/offline-m2/com/android/tools/repository/25.1.0/repository-25.1.0.jar
deleted file mode 100644
index 3401f6f..0000000
--- a/common/offline-m2/com/android/tools/repository/25.1.0/repository-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/repository/25.1.0/repository-25.1.0.pom b/common/offline-m2/com/android/tools/repository/25.1.0/repository-25.1.0.pom
deleted file mode 100644
index 9069cfd..0000000
--- a/common/offline-m2/com/android/tools/repository/25.1.0/repository-25.1.0.pom
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>repository</artifactId>
-  <version>25.1.0</version>
-  <name>Android Tools repository</name>
-  <description>A library for downloading and managing package repositories</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.jar
deleted file mode 100644
index 9a2f428..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.pom
deleted file mode 100644
index d36bbd6..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>repository</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools repository</name>
-  <description>A library for downloading and managing package repositories</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jimfs</groupId>
-      <artifactId>jimfs</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.jar
deleted file mode 100644
index 2848a7b..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-beta2/repository-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/repository/25.2.0-beta2/repository-25.2.0-beta2.jar
deleted file mode 100644
index f4f2d63..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta2/repository-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-beta2/repository-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/repository/25.2.0-beta2/repository-25.2.0-beta2.pom
deleted file mode 100644
index aaeb2c8..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta2/repository-25.2.0-beta2.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>repository</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools repository</name>
-  <description>A library for downloading and managing package repositories</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jimfs</groupId>
-      <artifactId>jimfs</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-beta3/repository-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/repository/25.2.0-beta3/repository-25.2.0-beta3.jar
deleted file mode 100644
index 40c3838..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta3/repository-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-beta3/repository-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/repository/25.2.0-beta3/repository-25.2.0-beta3.pom
deleted file mode 100644
index 0fb3557..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta3/repository-25.2.0-beta3.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>repository</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools repository</name>
-  <description>A library for downloading and managing package repositories</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jimfs</groupId>
-      <artifactId>jimfs</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-rc1/repository-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/repository/25.2.0-rc1/repository-25.2.0-rc1.pom
deleted file mode 100644
index a40c3fe..0000000
--- a/common/offline-m2/com/android/tools/repository/25.2.0-rc1/repository-25.2.0-rc1.pom
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>repository</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools repository</name>
-  <description>A library for downloading and managing package repositories</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.jimfs</groupId>
-      <artifactId>jimfs</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-rc1/repository-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/repository/25.2.0/repository-25.2.0.jar
similarity index 89%
rename from common/offline-m2/com/android/tools/repository/25.2.0-rc1/repository-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/repository/25.2.0/repository-25.2.0.jar
index 1ef76f0..0ff7a35 100644
--- a/common/offline-m2/com/android/tools/repository/25.2.0-rc1/repository-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/repository/25.2.0/repository-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/repository/25.2.0/repository-25.2.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.pom
rename to common/offline-m2/com/android/tools/repository/25.2.0/repository-25.2.0.pom
index 11d2f9d..794f005 100644
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/repository/25.2.0/repository-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>repository</artifactId>
-  <version>25.2.0-beta1</version>
+  <version>25.2.0</version>
   <name>Android Tools repository</name>
   <description>A library for downloading and managing package repositories</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0/sdk-common-25.0.0.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0/sdk-common-25.0.0.jar
deleted file mode 100644
index 7fb1ee7..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0/sdk-common-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0/sdk-common-25.0.0.pom b/common/offline-m2/com/android/tools/sdk-common/25.0.0/sdk-common-25.0.0.pom
deleted file mode 100644
index 24fe78d..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0/sdk-common-25.0.0.pom
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdk-common</artifactId>
-  <version>25.0.0</version>
-  <name>Android Tools sdk-common library</name>
-  <description>sdk-common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.1.0/sdk-common-25.1.0.jar b/common/offline-m2/com/android/tools/sdk-common/25.1.0/sdk-common-25.1.0.jar
deleted file mode 100644
index 3fe5fad..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.1.0/sdk-common-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.1.0/sdk-common-25.1.0.pom b/common/offline-m2/com/android/tools/sdk-common/25.1.0/sdk-common-25.1.0.pom
deleted file mode 100644
index d9968af..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.1.0/sdk-common-25.1.0.pom
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdk-common</artifactId>
-  <version>25.1.0</version>
-  <name>Android Tools sdk-common library</name>
-  <description>sdk-common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.1.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.jar
deleted file mode 100644
index 084e080..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.pom
deleted file mode 100644
index 1ec9788..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdk-common</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools sdk-common library</name>
-  <description>sdk-common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.jar
deleted file mode 100644
index 6330502..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.pom
deleted file mode 100644
index a91ea41..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.pom
+++ /dev/null

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdk-common</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools sdk-common library</name>
-  <description>sdk-common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta2/sdk-common-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta2/sdk-common-25.2.0-beta2.jar
deleted file mode 100644
index 7a926ee..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta2/sdk-common-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta2/sdk-common-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta2/sdk-common-25.2.0-beta2.pom
deleted file mode 100644
index d5c320e..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta2/sdk-common-25.2.0-beta2.pom
+++ /dev/null

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdk-common</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools sdk-common library</name>
-  <description>sdk-common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta3/sdk-common-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta3/sdk-common-25.2.0-beta3.jar
deleted file mode 100644
index ca957b9..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta3/sdk-common-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-rc1/sdk-common-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/sdk-common/25.2.0-rc1/sdk-common-25.2.0-rc1.pom
deleted file mode 100644
index efc3f4f..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-rc1/sdk-common-25.2.0-rc1.pom
+++ /dev/null

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdk-common</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools sdk-common library</name>
-  <description>sdk-common library used by other Android tools libraries.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-rc1/sdk-common-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/sdk-common/25.2.0/sdk-common-25.2.0.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/25.2.0-rc1/sdk-common-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/sdk-common/25.2.0/sdk-common-25.2.0.jar
index 159ebc9..75df9a2 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-rc1/sdk-common-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.2.0/sdk-common-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta3/sdk-common-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/sdk-common/25.2.0/sdk-common-25.2.0.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/sdk-common/25.2.0-beta3/sdk-common-25.2.0-beta3.pom
rename to common/offline-m2/com/android/tools/sdk-common/25.2.0/sdk-common-25.2.0.pom
index de57b8a..6ba6521 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta3/sdk-common-25.2.0-beta3.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/25.2.0/sdk-common-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdk-common</artifactId>
-  <version>25.2.0-beta3</version>
+  <version>25.2.0</version>
   <name>Android Tools sdk-common library</name>
   <description>sdk-common library used by other Android tools libraries.</description>
   <url>http://tools.android.com</url>
@@ -29,19 +29,19 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta3</version>
+      <version>25.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta3</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta3</version>
+      <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
-      <version>25.2.0-beta3</version>
+      <version>25.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0/sdklib-25.0.0.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0/sdklib-25.0.0.jar
deleted file mode 100644
index a38c581..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0/sdklib-25.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdklib/25.1.0/sdklib-25.1.0.jar b/common/offline-m2/com/android/tools/sdklib/25.1.0/sdklib-25.1.0.jar
deleted file mode 100644
index d6b5180..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.1.0/sdklib-25.1.0.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdklib/25.1.0/sdklib-25.1.0.pom b/common/offline-m2/com/android/tools/sdklib/25.1.0/sdklib-25.1.0.pom
deleted file mode 100644
index d48996c..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.1.0/sdklib-25.1.0.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdklib</artifactId>
-  <version>25.1.0</version>
-  <name>Android Tools sdklib</name>
-  <description>A library to parse and download the Android SDK.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.jar
deleted file mode 100644
index 8c817e2..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.pom
deleted file mode 100644
index 3417a44..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdklib</artifactId>
-  <version>25.2.0-alpha7</version>
-  <name>Android Tools sdklib</name>
-  <description>A library to parse and download the Android SDK.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.2.0-alpha7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.jar
deleted file mode 100644
index 2c79684..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.pom
deleted file mode 100644
index 9f39cc5..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdklib</artifactId>
-  <version>25.2.0-beta1</version>
-  <name>Android Tools sdklib</name>
-  <description>A library to parse and download the Android SDK.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta2/sdklib-25.2.0-beta2.jar b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta2/sdklib-25.2.0-beta2.jar
deleted file mode 100644
index e794810..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta2/sdklib-25.2.0-beta2.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta2/sdklib-25.2.0-beta2.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta2/sdklib-25.2.0-beta2.pom
deleted file mode 100644
index 3269c2f..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta2/sdklib-25.2.0-beta2.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdklib</artifactId>
-  <version>25.2.0-beta2</version>
-  <name>Android Tools sdklib</name>
-  <description>A library to parse and download the Android SDK.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.2.0-beta2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta3/sdklib-25.2.0-beta3.jar b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta3/sdklib-25.2.0-beta3.jar
deleted file mode 100644
index 295aee6..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta3/sdklib-25.2.0-beta3.jar
+++ /dev/null
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta3/sdklib-25.2.0-beta3.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta3/sdklib-25.2.0-beta3.pom
deleted file mode 100644
index e1b9d54..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta3/sdklib-25.2.0-beta3.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdklib</artifactId>
-  <version>25.2.0-beta3</version>
-  <name>Android Tools sdklib</name>
-  <description>A library to parse and download the Android SDK.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.2.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-rc1/sdklib-25.2.0-rc1.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0-rc1/sdklib-25.2.0-rc1.pom
deleted file mode 100644
index 258fa37..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-rc1/sdklib-25.2.0-rc1.pom
+++ /dev/null

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.android.tools</groupId>
-  <artifactId>sdklib</artifactId>
-  <version>25.2.0-rc1</version>
-  <name>Android Tools sdklib</name>
-  <description>A library to parse and download the Android SDK.</description>
-  <url>http://tools.android.com</url>
-  <inceptionYear>2007</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>The Android Open Source Project</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
-    <url>https://android.googlesource.com/platform/tools/base</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.2.0-rc1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-rc1/sdklib-25.2.0-rc1.jar b/common/offline-m2/com/android/tools/sdklib/25.2.0/sdklib-25.2.0.jar
similarity index 91%
rename from common/offline-m2/com/android/tools/sdklib/25.2.0-rc1/sdklib-25.2.0-rc1.jar
rename to common/offline-m2/com/android/tools/sdklib/25.2.0/sdklib-25.2.0.jar
index 8f59872..dfef93d 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-rc1/sdklib-25.2.0-rc1.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.2.0/sdklib-25.2.0.jar
Binary files differ

diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0/sdklib-25.0.0.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0/sdklib-25.2.0.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/sdklib/25.0.0/sdklib-25.0.0.pom
rename to common/offline-m2/com/android/tools/sdklib/25.2.0/sdklib-25.2.0.pom
index d1d639d..a7f9da9 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0/sdklib-25.0.0.pom
+++ b/common/offline-m2/com/android/tools/sdklib/25.2.0/sdklib-25.2.0.pom

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdklib</artifactId>
-  <version>25.0.0</version>
+  <version>25.2.0</version>
   <name>Android Tools sdklib</name>
   <description>A library to parse and download the Android SDK.</description>
   <url>http://tools.android.com</url>
@@ -27,9 +27,33 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>dvlib</artifactId>
-      <version>25.0.0</version>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>repository</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.2.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.8.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -50,29 +74,5 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.0.0</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
commit	60c07f6f4cf714657affaffc1014a2bc88193a52	[log] [tgz]
author	Tor Norbye <tnorbye@google.com>	Fri Sep 16 12:30:24 2016 -0700
committer	Tor Norbye <tnorbye@google.com>	Fri Sep 16 12:30:24 2016 -0700
tree	bdc6fda5b19268b16507451403e4c3bfe5a58432
parent	57f4b641975db66e903f906c8fa130528a092d74 [diff]