From 5b17890a97b9d7b8778f06c0015e92859a98eed1 Mon Sep 17 00:00:00 2001
From: Raphael Moll <raphael@google.com>
Date: Wed, 30 Nov 2011 11:15:16 -0800
Subject: Merge "ADT 16: fix org.eclipse core.runtime to 3.6.0"

There is no such 3.6.2 version for the core.runtime plugin.
The org.eclipse.ui plugin does require 3.6.2 though.

SDK Bug: 5690034

(Cherry-pick from 68afb2636d773c139e6909ad69f4fda951ee8133)

Change-Id: I90220adcc2c640df900c311a2d00d1b5ef5cb020
---
 eclipse/features/com.android.ide.eclipse.adt/feature.xml             | 2 +-
 eclipse/features/com.android.ide.eclipse.ddms/feature.xml            | 4 ++--
 eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml | 4 ++--
 eclipse/features/com.android.ide.eclipse.traceview/feature.xml       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index 80af323..d9799b5 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -112,7 +112,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
 
    <requires>
       <import plugin="com.android.ide.eclipse.ddms" match="perfect"/>
-      <import plugin="org.eclipse.core.runtime" version="3.6" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
index 7989ef5..2674494 100644
--- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
@@ -228,8 +228,8 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.6" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.6" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.6.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.console"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui.ide"/>
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
index 06e5bbd..7145ddc 100644
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
@@ -223,8 +223,8 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.6" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.6" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.6.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.console"/>
       <import plugin="com.android.ide.eclipse.ddms" match="perfect"/>
    </requires>
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
index 69fc4ee..4aa71ff 100644
--- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
@@ -223,8 +223,8 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.6" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.6" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.6.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="com.android.ide.eclipse.ddms" version="10.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.filesystem"/>
-- 
cgit v1.1