Merge "Switch to version 0.12.1" into idea133

automerge: dcae4d1

* commit 'dcae4d18915384996282a18b84b9196339b60588':
  Switch to version 0.12.1

64 files changed, 64 insertions, 64 deletions

diff --git a/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java b/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
index 2fa7e6abd7..e6b555442a 100644
--- a/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
+++ b/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
@@ -63,7 +63,7 @@ import java.util.Map;
 
 public class AndroidProjectTest extends TestCase {
 
-    private static final String MODEL_VERSION = "0.12.0";
+    private static final String MODEL_VERSION = "0.12.1";
 
     private static final Map<String, ProjectData> sProjectModelMap = Maps.newHashMap();
 
diff --git a/build-system/tests/3rdPartyTests/build.gradle b/build-system/tests/3rdPartyTests/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/3rdPartyTests/build.gradle
+++ b/build-system/tests/3rdPartyTests/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/3rdPartyTests/buildSrc/build.gradle b/build-system/tests/3rdPartyTests/buildSrc/build.gradle
index acac415263..c711499712 100644
--- a/build-system/tests/3rdPartyTests/buildSrc/build.gradle
+++ b/build-system/tests/3rdPartyTests/buildSrc/build.gradle
@@ -6,5 +6,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.tools.build:builder-test-api:0.12.0'
+    compile 'com.android.tools.build:builder-test-api:0.12.1'
 }
\ No newline at end of file
diff --git a/build-system/tests/aidl/build.gradle b/build-system/tests/aidl/build.gradle
index ca935b9be5..cc108f60da 100644
--- a/build-system/tests/aidl/build.gradle
+++ b/build-system/tests/aidl/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.library'
diff --git a/build-system/tests/api/build.gradle b/build-system/tests/api/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/api/build.gradle
+++ b/build-system/tests/api/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/applibtest/build.gradle b/build-system/tests/applibtest/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/applibtest/build.gradle
+++ b/build-system/tests/applibtest/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/artifactApi/build.gradle b/build-system/tests/artifactApi/build.gradle
index a8cb7fef64..f357148d43 100644
--- a/build-system/tests/artifactApi/build.gradle
+++ b/build-system/tests/artifactApi/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/assets/build.gradle b/build-system/tests/assets/build.gradle
index 9411c501db..2a5b1a090f 100644
--- a/build-system/tests/assets/build.gradle
+++ b/build-system/tests/assets/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/attrOrder/build.gradle b/build-system/tests/attrOrder/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/attrOrder/build.gradle
+++ b/build-system/tests/attrOrder/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/autorepo/build.gradle b/build-system/tests/autorepo/build.gradle
index 8fd5c7ab2c..9cd3d7337d 100644
--- a/build-system/tests/autorepo/build.gradle
+++ b/build-system/tests/autorepo/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/basic/build.gradle b/build-system/tests/basic/build.gradle
index e023dbf8e2..75c428cb82 100644
--- a/build-system/tests/basic/build.gradle
+++ b/build-system/tests/basic/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/basicMultiFlavors/build.gradle b/build-system/tests/basicMultiFlavors/build.gradle
index 99d4abf0ae..88bcc9dd2a 100644
--- a/build-system/tests/basicMultiFlavors/build.gradle
+++ b/build-system/tests/basicMultiFlavors/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/customArtifactDep/build.gradle b/build-system/tests/customArtifactDep/build.gradle
index 01fed3378e..ef538e822b 100644
--- a/build-system/tests/customArtifactDep/build.gradle
+++ b/build-system/tests/customArtifactDep/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/dependencies/build.gradle b/build-system/tests/dependencies/build.gradle
index 0e3db187f9..6b029fc319 100644
--- a/build-system/tests/dependencies/build.gradle
+++ b/build-system/tests/dependencies/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/dependencyChecker/build.gradle b/build-system/tests/dependencyChecker/build.gradle
index f5b6553f41..20b816cb5a 100644
--- a/build-system/tests/dependencyChecker/build.gradle
+++ b/build-system/tests/dependencyChecker/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/embedded/build.gradle b/build-system/tests/embedded/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/embedded/build.gradle
+++ b/build-system/tests/embedded/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/extractAnnotations/build.gradle b/build-system/tests/extractAnnotations/build.gradle
index 1d1851fb01..d914732f54 100644
--- a/build-system/tests/extractAnnotations/build.gradle
+++ b/build-system/tests/extractAnnotations/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/filteredOutBuildType/build.gradle b/build-system/tests/filteredOutBuildType/build.gradle
index bd0609beaa..6fb8d3119d 100644
--- a/build-system/tests/filteredOutBuildType/build.gradle
+++ b/build-system/tests/filteredOutBuildType/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/filteredOutVariants/build.gradle b/build-system/tests/filteredOutVariants/build.gradle
index 4c88cea12b..de8deb2e9c 100644
--- a/build-system/tests/filteredOutVariants/build.gradle
+++ b/build-system/tests/filteredOutVariants/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/flavored/build.gradle b/build-system/tests/flavored/build.gradle
index 01329ddceb..2c38ccfd70 100644
--- a/build-system/tests/flavored/build.gradle
+++ b/build-system/tests/flavored/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/flavoredlib/build.gradle b/build-system/tests/flavoredlib/build.gradle
index 9411c501db..2a5b1a090f 100644
--- a/build-system/tests/flavoredlib/build.gradle
+++ b/build-system/tests/flavoredlib/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/flavorlib/build.gradle b/build-system/tests/flavorlib/build.gradle
index 9411c501db..2a5b1a090f 100644
--- a/build-system/tests/flavorlib/build.gradle
+++ b/build-system/tests/flavorlib/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/flavorlibWithFailedTests/build.gradle b/build-system/tests/flavorlibWithFailedTests/build.gradle
index 9411c501db..2a5b1a090f 100644
--- a/build-system/tests/flavorlibWithFailedTests/build.gradle
+++ b/build-system/tests/flavorlibWithFailedTests/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/flavors/build.gradle b/build-system/tests/flavors/build.gradle
index ef37a9e3db..a219d52015 100644
--- a/build-system/tests/flavors/build.gradle
+++ b/build-system/tests/flavors/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/genFolderApi/build.gradle b/build-system/tests/genFolderApi/build.gradle
index 70289c0b01..3eb0d35864 100644
--- a/build-system/tests/genFolderApi/build.gradle
+++ b/build-system/tests/genFolderApi/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/genFolderApi2/build.gradle b/build-system/tests/genFolderApi2/build.gradle
index df8734c9d5..48cba3b343 100644
--- a/build-system/tests/genFolderApi2/build.gradle
+++ b/build-system/tests/genFolderApi2/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/libProguard/build.gradle b/build-system/tests/libProguard/build.gradle
index 00d7644a3f..3db14272cd 100644
--- a/build-system/tests/libProguard/build.gradle
+++ b/build-system/tests/libProguard/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/libProguardConsumerFiles/build.gradle b/build-system/tests/libProguardConsumerFiles/build.gradle
index 7dc71012a9..3f8c3ac545 100644
--- a/build-system/tests/libProguardConsumerFiles/build.gradle
+++ b/build-system/tests/libProguardConsumerFiles/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/libProguardJarDep/build.gradle b/build-system/tests/libProguardJarDep/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/libProguardJarDep/build.gradle
+++ b/build-system/tests/libProguardJarDep/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/libProguardLibDep/build.gradle b/build-system/tests/libProguardLibDep/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/libProguardLibDep/build.gradle
+++ b/build-system/tests/libProguardLibDep/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/libTestDep/build.gradle b/build-system/tests/libTestDep/build.gradle
index c62fd1c389..18a518eb4a 100644
--- a/build-system/tests/libTestDep/build.gradle
+++ b/build-system/tests/libTestDep/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/libsTest/build.gradle b/build-system/tests/libsTest/build.gradle
index 9411c501db..2a5b1a090f 100644
--- a/build-system/tests/libsTest/build.gradle
+++ b/build-system/tests/libsTest/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/localAarTest/build.gradle b/build-system/tests/localAarTest/build.gradle
index 9411c501db..2a5b1a090f 100644
--- a/build-system/tests/localAarTest/build.gradle
+++ b/build-system/tests/localAarTest/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/localJars/build.gradle b/build-system/tests/localJars/build.gradle
index 93f40d7279..e077753280 100644
--- a/build-system/tests/localJars/build.gradle
+++ b/build-system/tests/localJars/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/mavenLocal/app/build.gradle b/build-system/tests/mavenLocal/app/build.gradle
index 719346a9d9..10e582b013 100644
--- a/build-system/tests/mavenLocal/app/build.gradle
+++ b/build-system/tests/mavenLocal/app/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/mavenLocal/baseLibrary/build.gradle b/build-system/tests/mavenLocal/baseLibrary/build.gradle
index d42050b242..45b19e7a93 100644
--- a/build-system/tests/mavenLocal/baseLibrary/build.gradle
+++ b/build-system/tests/mavenLocal/baseLibrary/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/mavenLocal/library/build.gradle b/build-system/tests/mavenLocal/library/build.gradle
index d31c9679b0..6508809cc9 100644
--- a/build-system/tests/mavenLocal/library/build.gradle
+++ b/build-system/tests/mavenLocal/library/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/migrated/build.gradle b/build-system/tests/migrated/build.gradle
index 77384a6a5a..2ef686dc68 100644
--- a/build-system/tests/migrated/build.gradle
+++ b/build-system/tests/migrated/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/multiproject/build.gradle b/build-system/tests/multiproject/build.gradle
index 93f40d7279..e077753280 100644
--- a/build-system/tests/multiproject/build.gradle
+++ b/build-system/tests/multiproject/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/multires/build.gradle b/build-system/tests/multires/build.gradle
index a288159168..42b225ae17 100644
--- a/build-system/tests/multires/build.gradle
+++ b/build-system/tests/multires/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/ndkJniLib/build.gradle b/build-system/tests/ndkJniLib/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/ndkJniLib/build.gradle
+++ b/build-system/tests/ndkJniLib/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/ndkLibPrebuilts/build.gradle b/build-system/tests/ndkLibPrebuilts/build.gradle
index 5490824b3e..6cad3dd690 100644
--- a/build-system/tests/ndkLibPrebuilts/build.gradle
+++ b/build-system/tests/ndkLibPrebuilts/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/ndkPrebuilts/build.gradle b/build-system/tests/ndkPrebuilts/build.gradle
index 6a6a5a19ba..4fe58e360f 100644
--- a/build-system/tests/ndkPrebuilts/build.gradle
+++ b/build-system/tests/ndkPrebuilts/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/ndkRsHelloCompute/build.gradle b/build-system/tests/ndkRsHelloCompute/build.gradle
index e30900f65c..9a7d06560d 100644
--- a/build-system/tests/ndkRsHelloCompute/build.gradle
+++ b/build-system/tests/ndkRsHelloCompute/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/ndkSanAngeles/build.gradle b/build-system/tests/ndkSanAngeles/build.gradle
index b72ee6206f..fb4b544d5b 100644
--- a/build-system/tests/ndkSanAngeles/build.gradle
+++ b/build-system/tests/ndkSanAngeles/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/noPreDex/build.gradle b/build-system/tests/noPreDex/build.gradle
index 0c3cd19828..228615e061 100644
--- a/build-system/tests/noPreDex/build.gradle
+++ b/build-system/tests/noPreDex/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/overlay1/build.gradle b/build-system/tests/overlay1/build.gradle
index 358124230e..30c1e3ba32 100644
--- a/build-system/tests/overlay1/build.gradle
+++ b/build-system/tests/overlay1/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/overlay2/build.gradle b/build-system/tests/overlay2/build.gradle
index c6bcf513cd..d1c5bc06bc 100644
--- a/build-system/tests/overlay2/build.gradle
+++ b/build-system/tests/overlay2/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/overlay3/build.gradle b/build-system/tests/overlay3/build.gradle
index 64b09130c9..9181f6c7a4 100644
--- a/build-system/tests/overlay3/build.gradle
+++ b/build-system/tests/overlay3/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/packagingOptions/build.gradle b/build-system/tests/packagingOptions/build.gradle
index 7574ceb104..3644070015 100644
--- a/build-system/tests/packagingOptions/build.gradle
+++ b/build-system/tests/packagingOptions/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/pkgOverride/build.gradle b/build-system/tests/pkgOverride/build.gradle
index d68430c8dd..82f7fbf0cd 100644
--- a/build-system/tests/pkgOverride/build.gradle
+++ b/build-system/tests/pkgOverride/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/proguard/build.gradle b/build-system/tests/proguard/build.gradle
index 6462b72890..e00a3a32fc 100644
--- a/build-system/tests/proguard/build.gradle
+++ b/build-system/tests/proguard/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/proguardLib/build.gradle b/build-system/tests/proguardLib/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/proguardLib/build.gradle
+++ b/build-system/tests/proguardLib/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/renamedApk/build.gradle b/build-system/tests/renamedApk/build.gradle
index 665dd496fb..03c8f3a5fa 100644
--- a/build-system/tests/renamedApk/build.gradle
+++ b/build-system/tests/renamedApk/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/renderscript/build.gradle b/build-system/tests/renderscript/build.gradle
index 832327addc..32d7933e12 100644
--- a/build-system/tests/renderscript/build.gradle
+++ b/build-system/tests/renderscript/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/renderscriptInLib/build.gradle b/build-system/tests/renderscriptInLib/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/renderscriptInLib/build.gradle
+++ b/build-system/tests/renderscriptInLib/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
diff --git a/build-system/tests/renderscriptMultiSrc/build.gradle b/build-system/tests/renderscriptMultiSrc/build.gradle
index c0b9b9be92..2f1a6396bd 100644
--- a/build-system/tests/renderscriptMultiSrc/build.gradle
+++ b/build-system/tests/renderscriptMultiSrc/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/repo/app/build.gradle b/build-system/tests/repo/app/build.gradle
index 0a4871a0d1..178df9d3e2 100644
--- a/build-system/tests/repo/app/build.gradle
+++ b/build-system/tests/repo/app/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/repo/baseLibrary/build.gradle b/build-system/tests/repo/baseLibrary/build.gradle
index 8301a12344..8a4392817a 100644
--- a/build-system/tests/repo/baseLibrary/build.gradle
+++ b/build-system/tests/repo/baseLibrary/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/repo/library/build.gradle b/build-system/tests/repo/library/build.gradle
index 0875e3cf2e..e8fe6282dd 100644
--- a/build-system/tests/repo/library/build.gradle
+++ b/build-system/tests/repo/library/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/rsSupportMode/build.gradle b/build-system/tests/rsSupportMode/build.gradle
index 15bfa16f8b..56b462f343 100644
--- a/build-system/tests/rsSupportMode/build.gradle
+++ b/build-system/tests/rsSupportMode/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/sameNamedLibs/build.gradle b/build-system/tests/sameNamedLibs/build.gradle
index 9411c501db..2a5b1a090f 100644
--- a/build-system/tests/sameNamedLibs/build.gradle
+++ b/build-system/tests/sameNamedLibs/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 
diff --git a/build-system/tests/testWithDep/build.gradle b/build-system/tests/testWithDep/build.gradle
index 463453b28c..2d029e1345 100644
--- a/build-system/tests/testWithDep/build.gradle
+++ b/build-system/tests/testWithDep/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/tictactoe/build.gradle b/build-system/tests/tictactoe/build.gradle
index 0dcd0284be..8c8323f7d2 100644
--- a/build-system/tests/tictactoe/build.gradle
+++ b/build-system/tests/tictactoe/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../../out/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:0.12.1'
     }
 }