Merge "Bump tools version to 25.2.5 for emulator 2.2 release" into emu-2.2-release
diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product
index 90285a2..05f749b 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.4.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.2.5.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml
index 18ca01a..f8c7835 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 fbb6984..cc9ed4b 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.4.qualifier"
+ version="25.2.5.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 eeb3e06..c374ab8 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 8ff1c4b..7402efc 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.4.qualifier"
+ version="25.2.5.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 312d720..76982ec 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 e30be1f..f453ec7 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.4.qualifier"
+ version="25.2.5.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 a633bf5..98fda17 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 998bbf7..818de5d 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.4.qualifier"
+ version="25.2.5.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 cfe42f5..3cc5a07 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 9967052..4f9f6b3 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.4.qualifier"
+ version="25.2.5.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 d6fdbb3..1549afe 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 edb48e3..d1d4848 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.4.qualifier"
+ version="25.2.5.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 1d974d0..3c36e1e 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 00baa9b..7d3c779 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.4.qualifier"
+ version="25.2.5.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 3c7669c..1157303 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 55a75bc..620a915 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.4.qualifier"
+ version="25.2.5.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 ee9560b..731a963 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.4.qualifier"
+ version="25.2.5.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 31fb46c..24542f1 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.4.qualifier"
+ version="25.2.5.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 80e0c86..9c5a43e 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 f1a061d..d4eb882 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.4-SNAPSHOT/products/"
+def basePath = "../../../out/host/maven/bundles-25.2.5-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 3711868..9f46b98 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT XML Overlay
Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 805b0cc..5b4c8af 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 505cfcb..4551921 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT Package
Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 d227aba..3ceb951 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 a30ff1a..ac995e4 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Android Development Toolkit
Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 114efa6..f1ef7f0 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 917eef4..9f73d38 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Android Utilities
Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 abcfbb1..3f6b671 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 a4fa8b2..8a617e1 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 330fef8..d670f30 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 b64eccb..1e6895f 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: gldebugger-tests
Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 fb81d0c..a955533 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 db6fcba..dbb5924 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tracer for OpenGL ES
Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 8251ddc..9a00e17 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 66e68c5..ebd3204 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Hierarchy Viewer
Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 96a3cd7..0390099 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 b6cdc8d..4b3a4f6 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.android.ide.eclipse.monitor;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 981c28a..1bb3d45 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-Name = Monitor
aboutText = \n\
Android Device Monitor\n\
-Version: 25.2.4 \n\
+Version: 25.2.5 \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 4cef276..908f10d 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 60a79c7..08bc8cd 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT CDT Integration
Bundle-SymbolicName: com.android.ide.eclipse.ndk;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 e92daf4..8662a64 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 2e2b6df..cd04658 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Pdt
Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 f9531aa..f086467 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Android Plugin Tests
Bundle-SymbolicName: com.android.ide.eclipse.tests
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 09112b3..2257877 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 5e85f38..7a41230 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Traceview
Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true
-Bundle-Version: 25.2.4.qualifier
+Bundle-Version: 25.2.5.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 2f4dccd..7504116 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.4-SNAPSHOT</version>
+ <version>25.2.5-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 aed83a8..bd84cbe 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.4.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_25.2.5.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.2.5.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_25.2.4.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_25.2.5.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.2.5.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.2.4.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.2.5.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.2.5.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_25.2.4.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_25.2.5.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.2.5.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.gldebugger_25.2.4.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.gldebugger_25.2.5.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.2.5.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ndk_25.2.4.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.ndk_25.2.5.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.2.5.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 7973faa..b1c4be1 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.4.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_25.2.5.qualifier.jar" id="com.android.ide.eclipse.adt" version="25.2.5.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_25.2.4.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_25.2.5.qualifier.jar" id="com.android.ide.eclipse.ddms" version="25.2.5.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.2.4.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_25.2.5.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="25.2.5.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.tests_25.2.4.qualifier.jar" id="com.android.ide.eclipse.tests" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.tests_25.2.5.qualifier.jar" id="com.android.ide.eclipse.tests" version="25.2.5.qualifier">
<category name="test"/>
</feature>
- <feature url="features/com.android.ide.eclipse.pdt_25.2.4.qualifier.jar" id="com.android.ide.eclipse.pdt" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.pdt_25.2.5.qualifier.jar" id="com.android.ide.eclipse.pdt" version="25.2.5.qualifier">
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_25.2.4.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_25.2.5.qualifier.jar" id="com.android.ide.eclipse.traceview" version="25.2.5.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.gldebugger_25.2.4.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.gldebugger_25.2.5.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="25.2.5.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ndk_25.2.4.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.2.4.qualifier">
+ <feature url="features/com.android.ide.eclipse.ndk_25.2.5.qualifier.jar" id="com.android.ide.eclipse.ndk" version="25.2.5.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
diff --git a/files/tools_source.properties b/files/tools_source.properties
index 1392f2b..fef305f 100644
--- a/files/tools_source.properties
+++ b/files/tools_source.properties
@@ -1,3 +1,3 @@
Pkg.UserSrc=false
-Pkg.Revision=25.2.4
+Pkg.Revision=25.2.5
Platform.MinPlatformToolsRev=20
