Merge "Bump tools version to 25.3.0 for emulator 2.3 release" into emu-master-dev

50 files changed, 62 insertions, 62 deletions

diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product
index 11ed142cb..9df3b3f9b 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="25.2.3.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="25.3.0.qualifier" useFeatures="true" includeLaunchers="true">
 
 
    <configIni use="default">
diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml
index ea54bb1a0..81255a072 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.0-SNAPSHOT</version>
     <artifactId>bundles</artifactId>
     <packaging>eclipse-repository</packaging>
     <name>bundles</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 a63500bbe..5fd6cc09d 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="25.2.3.qualifier"
+      version="25.3.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 2faa8ae89..faff49312 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 157d6f7cd..1c9a89349 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="25.2.3.qualifier"
+      version="25.3.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 85c28e6f7..a9b7b7689 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 9aa400ad0..537e9221b 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="25.2.3.qualifier"
+      version="25.3.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 371dd9e0c..ce4599a06 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 d82b1c96d..dbca9c554 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="25.2.3.qualifier"
+      version="25.3.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 21919e783..9f1192753 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 225ef0782..54364905d 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="25.2.3.qualifier"
+      version="25.3.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 014f497c5..a4337a479 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 92515e807..7182620b9 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="25.2.3.qualifier"
+      version="25.3.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 739f93a67..ae28e863b 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 2871f2526..6a2624b7f 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="25.2.3.qualifier"
+      version="25.3.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 c0c13c492..2a350f64a 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 7bfc6685b..909f80e7e 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="25.2.3.qualifier"
+      version="25.3.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 c0af158da..ef291b22f 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="25.2.3.qualifier"
+      version="25.3.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 615d3fe7e..4c9cef06c 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="25.2.3.qualifier"
+      version="25.3.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 7a14accb4..d29c24be7 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 24741e857..2356efdc1 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-25.2.3-SNAPSHOT/products/"
+def basePath = "../../../out/host/maven/bundles-25.3.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 885c81a89..e0dac1780 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 3cdb6cbe5..87b23bc5a 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 c617740db..989fc5aac 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 66ac4661a..5a728ae30 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 b007cd3bb..250d0907a 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 334ecfe2b..ca4c25e69 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 822deb8b7..7f4b65077 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 83676d9ee..127ccc55f 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 20c633383..86079aa9e 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 625811361..b991a290e 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 caa6551df..0d0da7826 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 0f59e6335..bfcf0fc60 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 cd5bde2d9..8f22cd433 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 f223d8f25..55e77acfa 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 2e0a6b006..6d4fcd7fd 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 d9198b92c..a3a84bd4e 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 025557915..d7ce1b899 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 9df9864d9..0ccbc85c4 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: 25.2.3 \n\
+Version: 25.3.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 12ad84220..7480e4655 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 0228e183c..d6e730ae2 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 f605fb02d..19b8d0337 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 e7d0e50ef..165033611 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 27b87b5d9..dd18a4c99 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 9beb0b097..c3670c1c0 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 e3097e7d2..0a2731bad 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: 25.2.3.qualifier
+Bundle-Version: 25.3.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 57fff529d..1d24096ab 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>25.2.3-SNAPSHOT</version>
+    <version>25.3.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 b0d8f3a72..e1876bbc4 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_25.2.3.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_25.3.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.3.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ddms_25.2.3.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_25.3.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.3.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.2.3.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.3.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.3.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_25.2.3.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_25.3.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.3.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.gldebugger_25.2.3.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.gldebugger_25.3.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.3.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ndk_25.2.3.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.ndk_25.3.0.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.3.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 790018e85..6f13f7653 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_25.2.3.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_25.3.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.3.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ddms_25.2.3.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_25.3.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.3.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.2.3.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.3.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.3.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.tests_25.2.3.qualifier.jar" id="com.android.ide.eclipse.tests" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.tests_25.3.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="25.3.0.qualifier">
       <category name="test"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.pdt_25.2.3.qualifier.jar" id="com.android.ide.eclipse.pdt" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.pdt_25.3.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="25.3.0.qualifier">
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_25.2.3.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_25.3.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.3.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.gldebugger_25.2.3.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.gldebugger_25.3.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.3.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ndk_25.2.3.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.2.3.qualifier">
+   <feature url="features/com.android.ide.eclipse.ndk_25.3.0.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.3.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
diff --git a/files/tools_source.properties b/files/tools_source.properties
index f7e7ece45..fdb8dee3c 100644
--- a/files/tools_source.properties
+++ b/files/tools_source.properties
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=25.2.3
+Pkg.Revision=25.3.0
 Platform.MinPlatformToolsRev=20