am 0656acf7: am 55aebda6: Merge "Update the tests to 0.12.2" into idea133 automerge: 601e801android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release

* commit '0656acf71ab5045a4845a74e9e8c53874ce196fc':
  Update the tests to 0.12.2

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 e6b555442a..9f55db7b68 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.1";
+    private static final String MODEL_VERSION = "0.12.2";
 
     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 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/3rdPartyTests/buildSrc/build.gradle b/build-system/tests/3rdPartyTests/buildSrc/build.gradle
index c711499712..9d896a1680 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.1'
+    compile 'com.android.tools.build:builder-test-api:0.12.2'
 }
\ No newline at end of file
diff --git a/build-system/tests/aidl/build.gradle b/build-system/tests/aidl/build.gradle
index cc108f60da..9c310b8e1e 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.library'
diff --git a/build-system/tests/api/build.gradle b/build-system/tests/api/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/applibtest/build.gradle b/build-system/tests/applibtest/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/artifactApi/build.gradle b/build-system/tests/artifactApi/build.gradle
index f357148d43..fec49b662a 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/assets/build.gradle b/build-system/tests/assets/build.gradle
index 2a5b1a090f..43242320a6 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/attrOrder/build.gradle b/build-system/tests/attrOrder/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/autorepo/build.gradle b/build-system/tests/autorepo/build.gradle
index 9cd3d7337d..68ca50da0d 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/basic/build.gradle b/build-system/tests/basic/build.gradle
index 75c428cb82..ece52476a2 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/basicMultiFlavors/build.gradle b/build-system/tests/basicMultiFlavors/build.gradle
index 88bcc9dd2a..fcb876c603 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/customArtifactDep/build.gradle b/build-system/tests/customArtifactDep/build.gradle
index ef538e822b..d50884cefc 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/dependencies/build.gradle b/build-system/tests/dependencies/build.gradle
index 6b029fc319..eab479cd62 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/dependencyChecker/build.gradle b/build-system/tests/dependencyChecker/build.gradle
index 20b816cb5a..6e52fb8707 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/embedded/build.gradle b/build-system/tests/embedded/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/extractAnnotations/build.gradle b/build-system/tests/extractAnnotations/build.gradle
index d914732f54..16f8b79cec 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/filteredOutBuildType/build.gradle b/build-system/tests/filteredOutBuildType/build.gradle
index 6fb8d3119d..a10ca4c138 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/filteredOutVariants/build.gradle b/build-system/tests/filteredOutVariants/build.gradle
index de8deb2e9c..b3fe8b2c6a 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/flavored/build.gradle b/build-system/tests/flavored/build.gradle
index 2c38ccfd70..17f886a0c3 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/flavoredlib/build.gradle b/build-system/tests/flavoredlib/build.gradle
index 2a5b1a090f..43242320a6 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/flavorlib/build.gradle b/build-system/tests/flavorlib/build.gradle
index 2a5b1a090f..43242320a6 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/flavorlibWithFailedTests/build.gradle b/build-system/tests/flavorlibWithFailedTests/build.gradle
index 2a5b1a090f..43242320a6 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/flavors/build.gradle b/build-system/tests/flavors/build.gradle
index a219d52015..113934c0f9 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/genFolderApi/build.gradle b/build-system/tests/genFolderApi/build.gradle
index 3eb0d35864..7d89304748 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/genFolderApi2/build.gradle b/build-system/tests/genFolderApi2/build.gradle
index 48cba3b343..04107e1a7f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/libProguard/build.gradle b/build-system/tests/libProguard/build.gradle
index 3db14272cd..0a8b8a6c8a 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/libProguardConsumerFiles/build.gradle b/build-system/tests/libProguardConsumerFiles/build.gradle
index 3f8c3ac545..91cbee85da 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/libProguardJarDep/build.gradle b/build-system/tests/libProguardJarDep/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/libProguardLibDep/build.gradle b/build-system/tests/libProguardLibDep/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/libTestDep/build.gradle b/build-system/tests/libTestDep/build.gradle
index 18a518eb4a..aa9fedfc14 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/libsTest/build.gradle b/build-system/tests/libsTest/build.gradle
index 2a5b1a090f..43242320a6 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/localAarTest/build.gradle b/build-system/tests/localAarTest/build.gradle
index 2a5b1a090f..43242320a6 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/localJars/build.gradle b/build-system/tests/localJars/build.gradle
index e077753280..699a9a4d59 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/mavenLocal/app/build.gradle b/build-system/tests/mavenLocal/app/build.gradle
index 10e582b013..5f81d76833 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/mavenLocal/baseLibrary/build.gradle b/build-system/tests/mavenLocal/baseLibrary/build.gradle
index 45b19e7a93..4ebef5b681 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/mavenLocal/library/build.gradle b/build-system/tests/mavenLocal/library/build.gradle
index 6508809cc9..9795a6815d 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/migrated/build.gradle b/build-system/tests/migrated/build.gradle
index 2ef686dc68..0c7686705f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/multiproject/build.gradle b/build-system/tests/multiproject/build.gradle
index e077753280..699a9a4d59 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/multires/build.gradle b/build-system/tests/multires/build.gradle
index 42b225ae17..aefbdc0697 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/ndkJniLib/build.gradle b/build-system/tests/ndkJniLib/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/ndkLibPrebuilts/build.gradle b/build-system/tests/ndkLibPrebuilts/build.gradle
index 6cad3dd690..69194a9ec9 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/ndkPrebuilts/build.gradle b/build-system/tests/ndkPrebuilts/build.gradle
index 4fe58e360f..3f10fedce9 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/ndkRsHelloCompute/build.gradle b/build-system/tests/ndkRsHelloCompute/build.gradle
index 9a7d06560d..db44f17235 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/ndkSanAngeles/build.gradle b/build-system/tests/ndkSanAngeles/build.gradle
index fb4b544d5b..6b48d79245 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/noPreDex/build.gradle b/build-system/tests/noPreDex/build.gradle
index 228615e061..103cbe8b2b 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/overlay1/build.gradle b/build-system/tests/overlay1/build.gradle
index 30c1e3ba32..70394f5338 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/overlay2/build.gradle b/build-system/tests/overlay2/build.gradle
index d1c5bc06bc..c038004528 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/overlay3/build.gradle b/build-system/tests/overlay3/build.gradle
index 9181f6c7a4..bdc458a79a 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/packagingOptions/build.gradle b/build-system/tests/packagingOptions/build.gradle
index 3644070015..00aa7d84da 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/pkgOverride/build.gradle b/build-system/tests/pkgOverride/build.gradle
index 82f7fbf0cd..9233876639 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/proguard/build.gradle b/build-system/tests/proguard/build.gradle
index e00a3a32fc..b607826258 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/proguardLib/build.gradle b/build-system/tests/proguardLib/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/renamedApk/build.gradle b/build-system/tests/renamedApk/build.gradle
index 03c8f3a5fa..9889fd441c 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/renderscript/build.gradle b/build-system/tests/renderscript/build.gradle
index 32d7933e12..6fdb3a4555 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/renderscriptInLib/build.gradle b/build-system/tests/renderscriptInLib/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
diff --git a/build-system/tests/renderscriptMultiSrc/build.gradle b/build-system/tests/renderscriptMultiSrc/build.gradle
index 2f1a6396bd..c2f4823602 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/repo/app/build.gradle b/build-system/tests/repo/app/build.gradle
index 178df9d3e2..40fbedc426 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/repo/baseLibrary/build.gradle b/build-system/tests/repo/baseLibrary/build.gradle
index 8a4392817a..3241168aba 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/repo/library/build.gradle b/build-system/tests/repo/library/build.gradle
index e8fe6282dd..87180f109b 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/rsSupportMode/build.gradle b/build-system/tests/rsSupportMode/build.gradle
index 56b462f343..6ac4c0a63f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/sameNamedLibs/build.gradle b/build-system/tests/sameNamedLibs/build.gradle
index 2a5b1a090f..43242320a6 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 
diff --git a/build-system/tests/testWithDep/build.gradle b/build-system/tests/testWithDep/build.gradle
index 2d029e1345..0dd47ab296 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/build-system/tests/tictactoe/build.gradle b/build-system/tests/tictactoe/build.gradle
index 8c8323f7d2..84fb87731f 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.1'
+        classpath 'com.android.tools.build:gradle:0.12.2'
     }
 }