Merge "Update tools revision to 24.2.0" into studio-1.2-devstudio-1.2-dev

54 files changed, 78 insertions, 78 deletions

diff --git a/eclipse/artifacts/bundles/category.xml b/eclipse/artifacts/bundles/category.xml
index e4c8f4c9e..e519d4839 100644
--- a/eclipse/artifacts/bundles/category.xml
+++ b/eclipse/artifacts/bundles/category.xml
@@ -3,25 +3,25 @@
    <description url="https://dl-ssl.google.com/android/eclipse/">
       Update Site for Android Development Toolkit
    </description>
-   <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.2.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_24.2.0.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.gldebugger_24.2.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.adt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_24.2.0.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.adt.package_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.package.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt.package_24.2.0.qualifier.jar" id="com.android.ide.eclipse.adt.package.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ndk_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
    <category-def name="developer" label="Developer Tools">
diff --git a/eclipse/artifacts/bundles/ide.product b/eclipse/artifacts/bundles/ide.product
index d130861df..facafb29c 100644
--- a/eclipse/artifacts/bundles/ide.product
+++ b/eclipse/artifacts/bundles/ide.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Android Developers" uid="adtproduct" id="com.android.ide.eclipse.adt.package.adtproduct" application="org.eclipse.ui.ide.workbench" version="24.0.2.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Android Developers" uid="adtproduct" id="com.android.ide.eclipse.adt.package.adtproduct" application="org.eclipse.ui.ide.workbench" version="24.2.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/plugin-adt-package/adt-about.png"/>
@@ -44,7 +44,7 @@
    </plugins>
 
    <features>
-      <feature id="com.android.ide.eclipse.adt.package.feature" version="24.0.2.qualifier"/>
+      <feature id="com.android.ide.eclipse.adt.package.feature" version="24.2.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product
index 9b3c2541a..61b992669 100644
--- a/eclipse/artifacts/bundles/monitor.product
+++ b/eclipse/artifacts/bundles/monitor.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="monitor" uid="monitorproduct" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="24.0.2.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="monitor" uid="monitorproduct" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="24.2.0.qualifier" useFeatures="true" includeLaunchers="true">
 
 
    <configIni use="default">
diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml
index ca2fe3577..113b96be6 100644
--- a/eclipse/artifacts/bundles/pom.xml
+++ b/eclipse/artifacts/bundles/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>bundles</artifactId>
     <packaging>eclipse-repository</packaging>
     <name>bundles</name>
diff --git a/eclipse/artifacts/p2repo/category.xml b/eclipse/artifacts/p2repo/category.xml
index 5fa6ce07f..8d12066b3 100644
--- a/eclipse/artifacts/p2repo/category.xml
+++ b/eclipse/artifacts/p2repo/category.xml
@@ -3,22 +3,22 @@
    <description url="https://dl-ssl.google.com/android/eclipse/">
       Update Site for Android Development Toolkit
    </description>
-   <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.2.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_24.2.0.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.gldebugger_24.2.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.adt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_24.2.0.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ndk_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
    <category-def name="developer" label="Developer Tools">
diff --git a/eclipse/artifacts/p2repo/pom.xml b/eclipse/artifacts/p2repo/pom.xml
index acce87740..f2ce1e0ef 100644
--- a/eclipse/artifacts/p2repo/pom.xml
+++ b/eclipse/artifacts/p2repo/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>p2repo</artifactId>
     <packaging>eclipse-repository</packaging>
     <name>p2repo</name>
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
index 450aeb4f3..f87d016bc 100644
--- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.adt.package.feature"
       label="ADT Package"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project"
       plugin="com.android.ide.eclipse.adt.package">
 
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml
index a71c9e5f6..549e6f56d 100644
--- a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.adt.package.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>adt.package</name>
diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index 00207303d..eb74454ca 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.adt.feature"
       label="Android Development Tools"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project"
       plugin="com.android.ide.eclipse.adt">
 
diff --git a/eclipse/features/com.android.ide.eclipse.adt/pom.xml b/eclipse/features/com.android.ide.eclipse.adt/pom.xml
index a3ff33f57..308d49eeb 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.adt.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>adt</name>
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
index 1724cf5e8..94e26fb3f 100644
--- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.ddms.feature"
       label="Android DDMS"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project"
       plugin="com.android.ide.eclipse.ddms">
 
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml
index c17e681c9..e23b142b1 100644
--- a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.ddms.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>ddms</name>
diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
index 20d8a0ec1..05db7ed0c 100644
--- a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.gldebugger.feature"
       label="Tracer for OpenGL ES"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project">
 
    <description>
diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml
index 878d366b0..59b9a813e 100644
--- a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.gldebugger.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>gldebugger</name>
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
index e368b307a..ad83b81b4 100644
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.hierarchyviewer.feature"
       label="Android Hierarchy Viewer"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project"
       plugin="com.android.ide.eclipse.hierarchyviewer">
 
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml
index 90e22f424..799746d1e 100644
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.hierarchyviewer.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>hierarchyviewer</name>
diff --git a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml
index 2ac17c9c6..dfe2a7993 100644
--- a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.monitor.feature"
       label="Android Monitor"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project"
       plugin="com.android.ide.eclipse.monitor">
 
diff --git a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml
index 58564cba4..a78c64279 100644
--- a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.monitor.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>monitor</name>
diff --git a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml
index e7dccd3a9..6caa25d15 100644
--- a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.ndk.feature"
       label="Android Native Development Tools"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project">
 
    <description>
diff --git a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml
index 4034fe515..5f27ba3cc 100644
--- a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.ndk.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>ndk</name>
diff --git a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
index 7c21ee0c0..8720576f1 100644
--- a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.pdt"
       label="Android Platform Development Tools"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project">
 
    <description>
diff --git a/eclipse/features/com.android.ide.eclipse.tests/feature.xml b/eclipse/features/com.android.ide.eclipse.tests/feature.xml
index d91a7bf31..e2c364958 100644
--- a/eclipse/features/com.android.ide.eclipse.tests/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.tests/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.tests"
       label="ADT Tests"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project">
 
    <copyright>
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
index c43f4f2eb..da5fc9755 100644
--- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.traceview.feature"
       label="Android Traceview"
-      version="24.0.2.qualifier"
+      version="24.2.0.qualifier"
       provider-name="The Android Open Source Project"
       plugin="com.android.ide.eclipse.traceview">
 
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml
index 033658d36..2916f58b3 100644
--- a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml
+++ b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.traceview.feature</artifactId>
     <packaging>eclipse-feature</packaging>
     <name>traceview</name>
diff --git a/eclipse/monitor/build.gradle b/eclipse/monitor/build.gradle
index 5fde8f5a4..a1eb8f1c6 100644
--- a/eclipse/monitor/build.gradle
+++ b/eclipse/monitor/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'sdk-files'
 
-def basePath = "../../../out/host/maven/bundles-24.0.2-SNAPSHOT/products/"
+def basePath = "../../../out/host/maven/bundles-24.2.0-SNAPSHOT/products/"
 
 sdk {
     linux {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF
index b0c58b6cf..528d89b8f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ADT XML Overlay
 Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml
index d31932146..f4d2ec710 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>overlay.com.android.ide.eclipse.adt.overlay</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>adt.overlay</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF
index 34bbed667..20cb21a0e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ADT Package
 Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Vendor: The Android Open Source Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-BundleShape: dir
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml
index e40782df2..55c0eafac 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.adt.package</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>adt.package</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 7cf391230..74c5b18b3 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Android Development Toolkit
 Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-ClassPath: .,
  libs/sdkuilib.jar,
  libs/ninepatch.jar,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml
index f440c87b0..e9adec9e7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.adt</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>adt</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
index 6db8feb0a..3ba425147 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Android Utilities
 Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/pom.xml b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml
index dbce99509..785b55635 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.base</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>base</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
index 92ac9f176..025b3c0e8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Activator: com.android.ide.eclipse.ddms.DdmsPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml
index 3f0f90cc9..439e86727 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.ddms</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>ddms</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
index 55a61dd3e..0f7afcd7f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: gldebugger-tests
 Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit4;bundle-version="4.5.0";resolution:=optional,
  com.android.ide.eclipse.gldebugger,
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml
index 6c2d1b48a..2ba185049 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.gldebugger.tests</artifactId>
     <packaging>eclipse-test-plugin</packaging>
     <name>gldebugger.tests</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
index 68f4d2812..61dff436f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tracer for OpenGL ES
 Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Activator: com.android.ide.eclipse.gltrace.GlTracePlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml
index c8f7a0e25..3311ac6b9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.gldebugger</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>gldebugger</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
index f28447dd5..51b130f4e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Hierarchy Viewer
 Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Activator: com.android.ide.eclipse.hierarchyviewer.HierarchyViewerPlugin
 Bundle-Vendor: The Android Open Source Project
 Bundle-Localization: plugin
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml
index c37dc5658..b08521345 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.hierarchyviewer</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>hierarchyviewer</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
index 8bf0e01a8..f59248e5a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.android.ide.eclipse.monitor;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Activator: com.android.ide.eclipse.monitor.MonitorPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties
index 5b80fcfea..a1d85327f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties
@@ -4,5 +4,5 @@ Bundle-Vendor = The Android Open Source Project
 Bundle-Name = Monitor
 aboutText = \n\
 Android Device Monitor\n\
-Version: 24.0.2 \n\
+Version: 24.2.0 \n\
 Copyright 2012, The Android Open Source Project \n\
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml
index 0ec7d9bd1..3b26487e4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.monitor</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>monitor</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
index 7f60dd27b..7c658f4bf 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ADT CDT Integration
 Bundle-SymbolicName: com.android.ide.eclipse.ndk;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Activator: com.android.ide.eclipse.ndk.internal.Activator
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml
index e78f62811..63237eef4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.ndk</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>ndk</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF
index 6c9c4af13..30b99b950 100644
--- a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Pdt
 Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
index 37dbc7825..d1f0a02d6 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Android Plugin Tests
 Bundle-SymbolicName: com.android.ide.eclipse.tests
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Vendor: The Android Open Source Project
 Fragment-Host: com.android.ide.eclipse.adt;bundle-version="21.0.0"
 Require-Bundle: org.junit
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml
index ed90b3b2c..d15c376c6 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.tests</artifactId>
     <packaging>eclipse-test-plugin</packaging>
     <name>tests</name>
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
index 2a47a90f6..5f8cdcd09 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Traceview
 Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.2.0.qualifier
 Bundle-Activator: com.android.ide.eclipse.traceview.TraceviewPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml
index c911b8337..13a40e7d9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>24.0.2-SNAPSHOT</version>
+    <version>24.2.0-SNAPSHOT</version>
     <artifactId>com.android.ide.eclipse.traceview</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>traceview</name>
diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml
index bc262b63b..39dacf495 100644
--- a/eclipse/sites/external/site.xml
+++ b/eclipse/sites/external/site.xml
@@ -3,22 +3,22 @@
    <description url="https://dl-ssl.google.com/android/eclipse/">
       Update Site for Android Development Toolkit
    </description>
-   <feature url="features/com.android.ide.eclipse.adt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_24.2.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.2.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_24.2.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.gldebugger_24.2.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ndk_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.2.0.qualifier">
       <category name="ndk"/>
    </feature>
    <category-def name="developer" label="Developer Tools">
diff --git a/eclipse/sites/internal/site.xml b/eclipse/sites/internal/site.xml
index b77ab7f36..f3f196e87 100644
--- a/eclipse/sites/internal/site.xml
+++ b/eclipse/sites/internal/site.xml
@@ -3,32 +3,32 @@
    <description url="https://android.corp.google.com/adt/">
       Update Site for Android Development Toolkit
    </description>
-   <feature url="features/com.android.ide.eclipse.adt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_24.2.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.2.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.2.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.2.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.2.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.tests_24.0.2.qualifier.jar" id="com.android.ide.eclipse.tests" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.tests_24.2.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="24.2.0.qualifier">
       <category name="test"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.pdt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.pdt" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.pdt_24.2.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="24.2.0.qualifier">
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_24.2.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.2.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.gldebugger_24.2.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.2.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.0.2.qualifier">
+   <feature url="features/com.android.ide.eclipse.ndk_24.2.0.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.2.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
diff --git a/files/tools_source.properties b/files/tools_source.properties
index a77cdd518..a907b01f4 100644
--- a/files/tools_source.properties
+++ b/files/tools_source.properties
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=24.0.2
+Pkg.Revision=24.2.0
 Platform.MinPlatformToolsRev=20