Remove all non-Apache2 licensed files from sdk

Remove MODULE_LICENSE_APACHE2

Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.

Remove EPL-licensed eclipse plugin and attribute_stats.
Remove CC-BY-SA licensed typos files.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: treehugger
Test: https://android-build.googleplex.com/builds/forrest/run/L63500000550775268

Exempt-From-Owner-Approval: janitorial work
Change-Id: I5fafa76de21fb0b46c82a2c07ac048afbee3df25
diff --git a/attribute_stats/.classpath b/attribute_stats/.classpath
deleted file mode 100644
index fb50116..0000000
--- a/attribute_stats/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/attribute_stats/.gitignore b/attribute_stats/.gitignore
deleted file mode 100644
index ba077a4..0000000
--- a/attribute_stats/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/attribute_stats/.project b/attribute_stats/.project
deleted file mode 100644
index 2f2cff1..0000000
--- a/attribute_stats/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>attribute_stats</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/attribute_stats/.settings/org.eclipse.jdt.core.prefs b/attribute_stats/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ea66196..0000000
--- a/attribute_stats/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=com.android.annotations.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=com.android.annotations.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
-org.eclipse.jdt.core.compiler.annotation.nullable=com.android.annotations.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/attribute_stats/README.txt b/attribute_stats/README.txt
deleted file mode 100644
index 15f51c2..0000000
--- a/attribute_stats/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Attribute Statistics
----------------------
-
-This program gathers statistics about attribute usage in layout
-files. This is how the "topAttrs" attributes listed in ADT's
-extra-view-metadata.xml file (which drives the common attributes
-listed in the top of the context menu) is determined by running this
-script on a body of sample Android code, such as the AOSP repository.
-
-This program takes one or more directory paths, and then it searches
-all of them recursively for layout files that are not in folders
-containing the string "test", and computes and prints frequency
-statistics.
diff --git a/attribute_stats/src/Analyzer.java b/attribute_stats/src/Analyzer.java
deleted file mode 100644
index 8da53ea..0000000
--- a/attribute_stats/src/Analyzer.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * Gathers statistics about attribute usage in layout files. This is how the "topAttrs"
- * attributes listed in ADT's extra-view-metadata.xml (which drives the common attributes
- * listed in the top of the context menu) is determined by running this script on a body
- * of sample layout code.
- * <p>
- * This program takes one or more directory paths, and then it searches all of them recursively
- * for layout files that are not in folders containing the string "test", and computes and
- * prints frequency statistics.
- */
-public class Analyzer {
-    /** Number of attributes to print for each view */
-    public static final int ATTRIBUTE_COUNT = 6;
-    /** Separate out any attributes that constitute less than N percent of the total */
-    public static final int THRESHOLD = 10; // percent
-
-    private List<File> mDirectories;
-    private File mCurrentFile;
-    private boolean mListAdvanced;
-
-    /** Map from view id to map from attribute to frequency count */
-    private Map<String, Map<String, Usage>> mFrequencies =
-            new HashMap<String, Map<String, Usage>>(100);
-
-    private Map<String, Map<String, Usage>> mLayoutAttributeFrequencies =
-            new HashMap<String, Map<String, Usage>>(100);
-
-    private Map<String, String> mTopAttributes = new HashMap<String, String>(100);
-    private Map<String, String> mTopLayoutAttributes = new HashMap<String, String>(100);
-
-    private int mFileVisitCount;
-    private int mLayoutFileCount;
-    private File mXmlMetadataFile;
-
-    private Analyzer(List<File> directories, File xmlMetadataFile, boolean listAdvanced) {
-        mDirectories = directories;
-        mXmlMetadataFile = xmlMetadataFile;
-        mListAdvanced = listAdvanced;
-    }
-
-    public static void main(String[] args) {
-        if (args.length < 1) {
-            System.err.println("Usage: " + Analyzer.class.getSimpleName()
-                    + " <directory1> [directory2 [directory3 ...]]\n");
-            System.err.println("Recursively scans for layouts in the given directory and");
-            System.err.println("computes statistics about attribute frequencies.");
-            System.exit(-1);
-        }
-
-        File metadataFile = null;
-        List<File> directories = new ArrayList<File>();
-        boolean listAdvanced = false;
-        for (int i = 0, n = args.length; i < n; i++) {
-            String arg = args[i];
-
-            if (arg.equals("--list")) {
-                // List ALL encountered attributes
-                listAdvanced = true;
-                continue;
-            }
-
-            // The -metadata flag takes a pointer to an ADT extra-view-metadata.xml file
-            // and attempts to insert topAttrs attributes into it (and saves it as same
-            // file +.mod as an extension). This isn't listed on the usage flag because
-            // it's pretty brittle and requires some manual fixups to the file afterwards.
-            if (arg.equals("--metadata")) {
-                i++;
-                File file = new File(args[i]);
-                if (!file.exists()) {
-                    System.err.println(file.getName() + " does not exist");
-                    System.exit(-5);
-                }
-                if (!file.isFile() || !file.getName().endsWith(".xml")) {
-                    System.err.println(file.getName() + " must be an XML file");
-                    System.exit(-4);
-                }
-                metadataFile = file;
-                continue;
-            }
-            File directory = new File(arg);
-            if (!directory.exists()) {
-                System.err.println(directory.getName() + " does not exist");
-                System.exit(-2);
-            }
-
-            if (!directory.isDirectory()) {
-                System.err.println(directory.getName() + " is not a directory");
-                System.exit(-3);
-            }
-
-            directories.add(directory);
-        }
-
-        new Analyzer(directories, metadataFile, listAdvanced).analyze();
-    }
-
-    private void analyze() {
-        for (File directory : mDirectories) {
-            scanDirectory(directory);
-        }
-
-        if (mListAdvanced) {
-            listAdvanced();
-        }
-
-        printStatistics();
-
-        if (mXmlMetadataFile != null) {
-            printMergedMetadata();
-        }
-    }
-
-    private void scanDirectory(File directory) {
-        File[] files = directory.listFiles();
-        if (files == null) {
-            return;
-        }
-
-        for (File file : files) {
-            mFileVisitCount++;
-            if (mFileVisitCount % 50000 == 0) {
-                System.out.println("Analyzed " + mFileVisitCount + " files...");
-            }
-
-            if (file.isFile()) {
-                scanFile(file);
-            } else if (file.isDirectory()) {
-                // Skip stuff related to tests
-                if (file.getName().contains("test")) {
-                    continue;
-                }
-
-                // Recurse over subdirectories
-                scanDirectory(file);
-            }
-        }
-    }
-
-    private void scanFile(File file) {
-        if (file.getName().endsWith(".xml")) {
-            File parent = file.getParentFile();
-            if (parent.getName().startsWith("layout")) {
-                analyzeLayout(file);
-            }
-        }
-
-    }
-
-    private void analyzeLayout(File file) {
-        mCurrentFile = file;
-        mLayoutFileCount++;
-        Document document = null;
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        InputSource is = new InputSource(new StringReader(readFile(file)));
-        try {
-            factory.setNamespaceAware(true);
-            factory.setValidating(false);
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            document = builder.parse(is);
-
-            analyzeDocument(document);
-
-        } catch (ParserConfigurationException e) {
-            // pass -- ignore files we can't parse
-        } catch (SAXException e) {
-            // pass -- ignore files we can't parse
-        } catch (IOException e) {
-            // pass -- ignore files we can't parse
-        }
-    }
-
-
-    private void analyzeDocument(Document document) {
-        analyzeElement(document.getDocumentElement());
-    }
-
-    private void analyzeElement(Element element) {
-        if (element.getTagName().equals("item")) {
-            // Resource files shouldn't be in the layout/ folder but I came across
-            // some cases
-            System.out.println("Warning: found <item> tag in a layout file in "
-                    + mCurrentFile.getPath());
-            return;
-        }
-
-        countAttributes(element);
-        countLayoutAttributes(element);
-
-        // Recurse over children
-        NodeList childNodes = element.getChildNodes();
-        for (int i = 0, n = childNodes.getLength(); i < n; i++) {
-            Node child = childNodes.item(i);
-            if (child.getNodeType() == Node.ELEMENT_NODE) {
-                analyzeElement((Element) child);
-            }
-        }
-    }
-
-    private void countAttributes(Element element) {
-        String tag = element.getTagName();
-        Map<String, Usage> attributeMap = mFrequencies.get(tag);
-        if (attributeMap == null) {
-            attributeMap = new HashMap<String, Usage>(70);
-            mFrequencies.put(tag, attributeMap);
-        }
-
-        NamedNodeMap attributes = element.getAttributes();
-        for (int i = 0, n = attributes.getLength(); i < n; i++) {
-            Node attribute = attributes.item(i);
-            String name = attribute.getNodeName();
-
-            if (name.startsWith("android:layout_")) {
-                // Skip layout attributes; they are a function of the parent layout that this
-                // view is embedded within, not the view itself.
-                // TODO: Consider whether we should incorporate this info or make statistics
-                // about that as well?
-                continue;
-            }
-
-            if (name.equals("android:id")) {
-                // Skip ids: they are (mostly) unrelated to the view type and the tool
-                // already offers id editing prominently
-                continue;
-            }
-
-            if (name.startsWith("xmlns:")) {
-                // Unrelated to frequency counts
-                continue;
-            }
-
-            Usage usage = attributeMap.get(name);
-            if (usage == null) {
-                usage = new Usage(name);
-            } else {
-                usage.incrementCount();
-            }
-            attributeMap.put(name, usage);
-        }
-    }
-
-    private void countLayoutAttributes(Element element) {
-        String parentTag = element.getParentNode().getNodeName();
-        Map<String, Usage> attributeMap = mLayoutAttributeFrequencies.get(parentTag);
-        if (attributeMap == null) {
-            attributeMap = new HashMap<String, Usage>(70);
-            mLayoutAttributeFrequencies.put(parentTag, attributeMap);
-        }
-
-        NamedNodeMap attributes = element.getAttributes();
-        for (int i = 0, n = attributes.getLength(); i < n; i++) {
-            Node attribute = attributes.item(i);
-            String name = attribute.getNodeName();
-
-            if (!name.startsWith("android:layout_")) {
-                continue;
-            }
-
-            // Skip layout_width and layout_height; they are mandatory in all but GridLayout so not
-            // very interesting
-            if (name.equals("android:layout_width") || name.equals("android:layout_height")) {
-                continue;
-            }
-
-            Usage usage = attributeMap.get(name);
-            if (usage == null) {
-                usage = new Usage(name);
-            } else {
-                usage.incrementCount();
-            }
-            attributeMap.put(name, usage);
-        }
-    }
-
-    // Copied from AdtUtils
-    private static String readFile(File file) {
-        try {
-            return readFile(new FileReader(file));
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    private static String readFile(Reader inputStream) {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(inputStream);
-            StringBuilder sb = new StringBuilder(2000);
-            while (true) {
-                int c = reader.read();
-                if (c == -1) {
-                    return sb.toString();
-                } else {
-                    sb.append((char)c);
-                }
-            }
-        } catch (IOException e) {
-            // pass -- ignore files we can't read
-        } finally {
-            try {
-                if (reader != null) {
-                    reader.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return null;
-    }
-
-    private void printStatistics() {
-        System.out.println("Analyzed " + mLayoutFileCount
-                + " layouts (in a directory trees containing " + mFileVisitCount + " files)");
-        System.out.println("Top " + ATTRIBUTE_COUNT
-                + " for each view (excluding layout_ attributes) :");
-        System.out.println("\n");
-        System.out.println(" Rank    Count    Share  Attribute");
-        System.out.println("=========================================================");
-        List<String> views = new ArrayList<String>(mFrequencies.keySet());
-        Collections.sort(views);
-        for (String view : views) {
-            String top = processUageMap(view, mFrequencies.get(view));
-            if (top != null) {
-                mTopAttributes.put(view,  top);
-            }
-        }
-
-        System.out.println("\n\n\nTop " + ATTRIBUTE_COUNT + " layout attributes (excluding "
-                + "mandatory layout_width and layout_height):");
-        System.out.println("\n");
-        System.out.println(" Rank    Count    Share  Attribute");
-        System.out.println("=========================================================");
-        views = new ArrayList<String>(mLayoutAttributeFrequencies.keySet());
-        Collections.sort(views);
-        for (String view : views) {
-            String top = processUageMap(view, mLayoutAttributeFrequencies.get(view));
-            if (top != null) {
-                mTopLayoutAttributes.put(view,  top);
-            }
-        }
-    }
-
-    private static String processUageMap(String view, Map<String, Usage> map) {
-        if (map == null) {
-            return null;
-        }
-
-        if (view.indexOf('.') != -1 && !view.startsWith("android.")) {
-            // Skip custom views
-            return null;
-        }
-
-        List<Usage> values = new ArrayList<Usage>(map.values());
-        if (values.size() == 0) {
-            return null;
-        }
-
-        Collections.sort(values);
-        int totalCount = 0;
-        for (Usage usage : values) {
-            totalCount += usage.count;
-        }
-
-        System.out.println("\n<" + view + ">:");
-        if (view.equals("#document")) {
-            System.out.println("(Set on root tag, probably intended for included context)");
-        }
-
-        int place = 1;
-        int count = 0;
-        int prevCount = -1;
-        float prevPercentage = 0f;
-        StringBuilder sb = new StringBuilder();
-        for (Usage usage : values) {
-            if (count++ >= ATTRIBUTE_COUNT && usage.count < prevCount) {
-                break;
-            }
-
-            float percentage = 100 * usage.count/(float)totalCount;
-            if (percentage < THRESHOLD && prevPercentage >= THRESHOLD) {
-                System.out.println("  -----Less than 10%-------------------------------------");
-            }
-            System.out.printf("  %1d.    %5d    %5.1f%%  %s\n", place, usage.count,
-                    percentage, usage.attribute);
-
-            prevPercentage = percentage;
-            if (prevCount != usage.count) {
-                prevCount = usage.count;
-                place++;
-            }
-
-            if (percentage >= THRESHOLD /*&& usage.count > 1*/) { // 1:Ignore when not enough data?
-                if (sb.length() > 0) {
-                    sb.append(',');
-                }
-                String name = usage.attribute;
-                if (name.startsWith("android:")) {
-                    name = name.substring("android:".length());
-                }
-                sb.append(name);
-            }
-        }
-
-        return sb.length() > 0 ? sb.toString() : null;
-    }
-
-    private void printMergedMetadata() {
-        assert mXmlMetadataFile != null;
-        String metadata = readFile(mXmlMetadataFile);
-        if (metadata == null || metadata.length() == 0) {
-            System.err.println("Invalid metadata file");
-            System.exit(-6);
-        }
-
-        System.err.flush();
-        System.out.println("\n\nUpdating layout metadata file...");
-        System.out.flush();
-
-        StringBuilder sb = new StringBuilder((int) (2 * mXmlMetadataFile.length()));
-        String[] lines = metadata.split("\n");
-        for (int i = 0; i < lines.length; i++) {
-            String line = lines[i];
-            sb.append(line).append('\n');
-            int classIndex = line.indexOf("class=\"");
-            if (classIndex != -1) {
-                int start = classIndex + "class=\"".length();
-                int end = line.indexOf('"', start + 1);
-                if (end != -1) {
-                    String view = line.substring(start, end);
-                    if (view.startsWith("android.widget.")) {
-                        view = view.substring("android.widget.".length());
-                    } else if (view.startsWith("android.view.")) {
-                        view = view.substring("android.view.".length());
-                    } else if (view.startsWith("android.webkit.")) {
-                        view = view.substring("android.webkit.".length());
-                    }
-                    String top = mTopAttributes.get(view);
-                    if (top == null) {
-                        System.err.println("Warning: No frequency data for view " + view);
-                    } else {
-                        sb.append(line.substring(0, classIndex)); // Indentation
-
-                        sb.append("topAttrs=\"");
-                        sb.append(top);
-                        sb.append("\"\n");
-                    }
-
-                    top = mTopLayoutAttributes.get(view);
-                    if (top != null) {
-                        // It's a layout attribute
-                        sb.append(line.substring(0, classIndex)); // Indentation
-
-                        sb.append("topLayoutAttrs=\"");
-                        sb.append(top);
-                        sb.append("\"\n");
-                    }
-                }
-            }
-        }
-
-        System.out.println("\nTop attributes:");
-        System.out.println("--------------------------");
-        List<String> views = new ArrayList<String>(mTopAttributes.keySet());
-        Collections.sort(views);
-        for (String view : views) {
-            String top = mTopAttributes.get(view);
-            System.out.println(view + ": " + top);
-        }
-
-        System.out.println("\nTop layout attributes:");
-        System.out.println("--------------------------");
-        views = new ArrayList<String>(mTopLayoutAttributes.keySet());
-        Collections.sort(views);
-        for (String view : views) {
-            String top = mTopLayoutAttributes.get(view);
-            System.out.println(view + ": " + top);
-        }
-
-        System.out.println("\nModified XML metadata file:\n");
-        String newContent = sb.toString();
-        File output = new File(mXmlMetadataFile.getParentFile(), mXmlMetadataFile.getName() + ".mod");
-        if (output.exists()) {
-            output.delete();
-        }
-        try {
-            BufferedWriter writer = new BufferedWriter(new FileWriter(output));
-            writer.write(newContent);
-            writer.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        System.out.println("Done - wrote " + output.getPath());
-    }
-
-    //private File mPublicFile = new File(location, "data/res/values/public.xml");
-    private File mPublicFile = new File("/Volumes/AndroidWork/git/frameworks/base/core/res/res/values/public.xml");
-
-    private void listAdvanced() {
-        Set<String> keys = new HashSet<String>(1000);
-
-        // Merged usages across view types
-        Map<String, Usage> mergedUsages = new HashMap<String, Usage>(100);
-
-        for (Entry<String,Map<String,Usage>> entry : mFrequencies.entrySet()) {
-            String view = entry.getKey();
-            if (view.indexOf('.') != -1 && !view.startsWith("android.")) {
-                // Skip custom views etc
-                continue;
-            }
-            Map<String, Usage> map = entry.getValue();
-            for (Usage usage : map.values()) {
-//                if (usage.count == 1) {
-//                    System.out.println("Only found *one* usage of " + usage.attribute);
-//                }
-//                if (usage.count < 4) {
-//                    System.out.println("Only found " + usage.count + " usage of " + usage.attribute);
-//                }
-
-                String attribute = usage.attribute;
-                int index = attribute.indexOf(':');
-                if (index == -1 || attribute.startsWith("android:")) {
-                    Usage merged = mergedUsages.get(attribute);
-                    if (merged == null) {
-                        merged = new Usage(attribute);
-                        merged.count = usage.count;
-                        mergedUsages.put(attribute, merged);
-                    } else {
-                        merged.count += usage.count;
-                    }
-                }
-            }
-        }
-
-        for (Usage usage : mergedUsages.values())  {
-            String attribute = usage.attribute;
-            if (usage.count < 4) {
-                System.out.println("Only found " + usage.count + " usage of " + usage.attribute);
-                continue;
-            }
-            int index = attribute.indexOf(':');
-            if (index != -1) {
-                attribute = attribute.substring(index + 1); // +1: skip ':'
-            }
-            keys.add(attribute);
-        }
-
-        List<String> sorted = new ArrayList<String>(keys);
-        Collections.sort(sorted);
-        System.out.println("\nEncountered Attributes");
-        System.out.println("-----------------------------");
-        for (String attribute : sorted) {
-            System.out.println(attribute);
-        }
-
-        System.out.println();
-    }
-
-    private static class Usage implements Comparable<Usage> {
-        public String attribute;
-        public int count;
-
-
-        public Usage(String attribute) {
-            super();
-            this.attribute = attribute;
-
-            count = 1;
-        }
-
-        public void incrementCount() {
-            count++;
-        }
-
-        @Override
-        public int compareTo(Usage o) {
-            // Sort by decreasing frequency, then sort alphabetically
-            int frequencyDelta = o.count - count;
-            if (frequencyDelta != 0) {
-                return frequencyDelta;
-            } else {
-                return attribute.compareTo(o.attribute);
-            }
-        }
-
-        @Override
-        public String toString() {
-            return attribute + ": " + count;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((attribute == null) ? 0 : attribute.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            Usage other = (Usage) obj;
-            if (attribute == null) {
-                if (other.attribute != null)
-                    return false;
-            } else if (!attribute.equals(other.attribute))
-                return false;
-            return true;
-        }
-    }
-}
diff --git a/eclipse/.gitignore b/eclipse/.gitignore
deleted file mode 100644
index 78dbaee..0000000
--- a/eclipse/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.iml
-plugins/*/libs
-plugins/*/*.target
diff --git a/eclipse/artifacts/bundles/.project b/eclipse/artifacts/bundles/.project
deleted file mode 100644
index 9174087..0000000
--- a/eclipse/artifacts/bundles/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tycho-bundles</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product
deleted file mode 100644
index c8c0f38..0000000
--- a/eclipse/artifacts/bundles/monitor.product
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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.3.3.qualifier" useFeatures="true" includeLaunchers="true">
-
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-data @noDefault</programArgs>
-      <vmArgs>-XX:MaxPermSize=256m
--Xms512m
--Xmx1024m</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <splash
-      location="com.android.ide.eclipse.monitor" />
-   <launcher name="monitor">
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-
-   <vm>
-   </vm>
-
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="com.android.ide.eclipse.ddms.feature"/>
-      <feature id="com.android.ide.eclipse.gldebugger.feature"/>
-      <feature id="com.android.ide.eclipse.hierarchyviewer.feature"/>
-      <feature id="com.android.ide.eclipse.traceview.feature"/>
-      <feature id="com.android.ide.eclipse.monitor.feature"/>
-      <feature id="org.eclipse.rcp"/>
-      <feature id="org.eclipse.emf.ecore"/>
-      <feature id="org.eclipse.e4.rcp"/>
-      <feature id="org.eclipse.emf.common"/>
-      <feature id="org.eclipse.platform"/>
-      <feature id="org.eclipse.equinox.p2.core.feature"/>
-      <feature id="org.eclipse.help"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature"/>
-      <feature id="org.eclipse.equinox.p2.user.ui"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-   </configurations>
-
-</product>
diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml
deleted file mode 100644
index 3e8df67..0000000
--- a/eclipse/artifacts/bundles/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>bundles</artifactId>
-    <packaging>eclipse-repository</packaging>
-    <name>bundles</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-p2-director-plugin</artifactId>
-                <version>${tycho-version}</version>
-                <executions>
-                    <!-- install the product for all configured os/ws/arch environments
-                    using p2 director -->
-                    <execution>
-                        <id>materialize-products</id>
-                        <goals>
-                            <goal>materialize-products</goal>
-                        </goals>
-                    </execution>
-                    <!-- create product zips (one per os/ws/arch) -->
-                    <execution>
-                        <id>archive-products</id>
-                        <goals>
-                            <goal>archive-products</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <formats>
-                        <win32>zip</win32>
-                        <linux>zip</linux>
-                        <macosx>zip</macosx>
-                    </formats>
-                    <products>
-                        <product>
-                            <id>monitorproduct</id>
-                            <attachId>com.android.ide.eclipse.monitor.product</attachId>
-                            <rootFolder>monitor</rootFolder>
-                        </product>
-                    </products>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/eclipse/build.gradle b/eclipse/build.gradle
deleted file mode 100644
index 5624821..0000000
--- a/eclipse/build.gradle
+++ /dev/null
@@ -1,205 +0,0 @@
-// Script used to build ADT plugins, IDE and monitor
-// There are 2 major tasks done by this plugin:
-//    copydeps: copies tools/base, tools/swt and prebuilt jars into plugins' libs folder
-//    buildEclipse: builds Eclipse by running Tycho from the commandline
-//
-// Usage: $ ANDROID_SRC/tools/gradlew -i -b /path/to/this/build.gradle copydeps|buildEclipse
-
-// get tools/base version
-apply from: "../../tools/buildSrc/base/version.gradle"
-
-ext.outPath = System.env.OUT_DIR
-if (outPath != null) {
-    ext.outFile = new File(outPath)
-} else {
-    outPath = '../../out'
-    ext.outFile = new File(projectDir, outPath)
-}
-
-repositories {
-    maven { url '../../prebuilts/tools/common/m2/repository' }
-    maven { url outPath + '/repo' }
-}
-
-ext {
-    // list of plugins whose manifest should be examined to identify dependencies
-    adtPlugins = new File(projectDir, 'plugins').listFiles().findAll { it.name.startsWith("com.android") }
-
-    //
-    def eclipseBuildDeps = new File(projectDir, "../../prebuilts/eclipse-build-deps").getCanonicalFile()
-    targetComponents = [
-            "platform": new File(eclipseBuildDeps, "platform/org.eclipse.platform-4.2.2.zip"),
-            "cdt"     : new File(eclipseBuildDeps, "cdt/cdt-master-8.0.2.zip"),
-            "emf"     : new File(eclipseBuildDeps, "emf/emf-xsd-Update-2.9.1.zip"),
-            "jdt"     : new File(eclipseBuildDeps, "jdt/org.eclipse.jdt.source-4.2.2.zip"),
-            "wtp"     : new File(eclipseBuildDeps, "wtp/wtp-repo-R-3.3.2-20120210195245.zip"),
-            "gef"     : new File(eclipseBuildDeps, "gef/GEF-Update-3.9.1.zip"),
-            "pde"     : new File(eclipseBuildDeps, "pde/org.eclipse.pde-3.8.zip"),
-            "egit"    : new File(eclipseBuildDeps, "egit/org.eclipse.egit.repository-2.2.0.201212191850-r.zip"),
-    ]
-
-    buildNumber = System.getenv("BUILD_NUMBER")
-    if (buildNumber == null) {
-        buildNumber = "SNAPSHOT"
-    }
-}
-
-// a mapping from the library names as used inside the plugin's MANIFEST.MF to the Maven artifact id
-def artifacts = [
-        // tools/base and tools/swt dependencies
-        'manifest-merger'     : "com.android.tools.build:manifest-merger:$ext.baseVersion",
-        'ddmlib'              : "com.android.tools.ddms:ddmlib:$ext.baseVersion",
-        'ddmuilib'            : "com.android.tools.ddms:ddmuilib:$ext.baseVersion",
-        'layoutlib-api'       : "com.android.tools.layoutlib:layoutlib-api:$ext.baseVersion",
-        'lint-api'            : "com.android.tools.lint:lint-api:$ext.baseVersion",
-        'lint-checks'         : "com.android.tools.lint:lint-checks:$ext.baseVersion",
-        'asset-studio'        : "com.android.tools:asset-studio:$ext.baseVersion",
-        'annotations'         : "com.android.tools:annotations:$ext.baseVersion",
-        'common'              : "com.android.tools:common:$ext.baseVersion",
-        'dvlib'               : "com.android.tools:dvlib:$ext.baseVersion",
-        'hierarchyviewer2lib' : "com.android.tools:hierarchyviewer2lib:$ext.baseVersion",
-        'ninepatch'           : "com.android.tools:ninepatch:$ext.baseVersion",
-        'rule-api'            : "com.android.tools:rule-api:$ext.baseVersion",
-        'sdk-common'          : "com.android.tools:sdk-common:$ext.baseVersion",
-        'sdklib'              : "com.android.tools:sdklib:$ext.baseVersion",
-        'sdkstats'            : "com.android.tools:sdkstats:$ext.baseVersion",
-        'sdkuilib'            : "com.android.tools:sdkuilib:$ext.baseVersion",
-        'swtmenubar'          : "com.android.tools:swtmenubar:$ext.baseVersion",
-        'testutils'           : "com.android.tools:testutils:$ext.baseVersion",
-        'traceview'           : "com.android.tools:traceview:$ext.baseVersion",
-        'uiautomatorviewer'   : "com.android.tools:uiautomatorviewer:$ext.baseVersion",
-
-        // prebuilts
-        'ant-glob'                         : 'com.android.tools.external:ant-glob:1.0',
-        'asm-5.0.3'                        : 'org.ow2.asm:asm:5.0.3',
-        'asm-analysis-5.0.3'               : 'org.ow2.asm:asm-analysis:5.0.3',
-        'asm-tree-5.0.3'                   : 'org.ow2.asm:asm-tree:5.0.3',
-        'commons-codec-1.4'                : 'commons-codec:commons-codec:1.4',
-        'commons-compress-1.0'             : 'org.apache.commons:commons-compress:1.8.1',
-        'commons-logging-1.1.1'            : 'commons-logging:commons-logging:1.1.1',
-        'easymock'                         : 'org.easymock:easymock:3.3',
-        'freemarker-2.3.20'                : 'org.freemarker:freemarker:2.3.20',
-        'guava-17.0'                       : 'com.google.guava:guava:17.0',
-        'host-libprotobuf-java-2.3.0-lite' : 'com.android.tools.external:libprotobuf-java-lite:2.3.0',
-        'httpclient-4.1.1'                 : 'org.apache.httpcomponents:httpclient:4.1.1',
-        'httpcore-4.1'                     : 'org.apache.httpcomponents:httpcore:4.1',
-        'httpmime-4.1'                     : 'org.apache.httpcomponents:httpmime:4.1',
-        'jcommon-1.0.12'                   : 'jfree:jcommon:1.0.12',
-        'jfreechart-1.0.9'                 : 'jfree:jfreechart:1.0.9',
-        'jfreechart-swt-1.0.9'             : 'jfree:jfreechart-swt:1.0.9',
-        'kxml2-2.3.0'                      : 'net.sf.kxml:kxml2:2.3.0',
-        'liblzf-1.0'                       : 'com.android.tools.external:liblzf:1.0',
-        'lombok-ast-0.2.3'                 : 'com.android.tools.external.lombok:lombok-ast:0.2.3',
-        'propertysheet'                    : 'com.android.tools.external:propertysheet:1.0',
-]
-
-configurations {
-    compile
-}
-
-dependencies {
-    compile artifacts.values()
-}
-
-task copydeps << {
-    // get the resolved dependencies from the compile configuration
-    def resolvedDependencies = configurations.compile.resolvedConfiguration.firstLevelModuleDependencies
-
-    // generate a map from "xy.jar" -> "/path/to/xy-1.0.jar"
-    def artifactMap = [:]
-    resolvedDependencies.each { dependency ->
-        def dependencyId = dependency.getName()
-        def artifactName = artifacts.find{ it.value == dependencyId}?.key
-
-        // get the jar file corresponding to the dependency
-        def artifact = getArtifact(dependency)
-        artifactMap.put(artifactName + ".jar", artifact)
-    }
-
-    project.adtPlugins.each { File pluginFile ->
-        def manifestDeps = getManifestDependencies(new File(pluginFile, "META-INF/MANIFEST.MF"))
-        logger.info("Dependencies for " + pluginFile.toString() + ": " + manifestDeps.join(","))
-
-        File dest = new File(pluginFile, "libs")
-        if (!manifestDeps.isEmpty() && !dest.isDirectory()) {
-            dest.mkdirs()
-        }
-
-        manifestDeps.each {
-            if (!artifactMap.containsKey(it)) {
-                throw new RuntimeException("No resolved artifact for: " + it + ", required for: "
-                        + pluginFile.getPath())
-            }
-
-            String destName = artifactMap.get(it)
-            logger.info("\tCopying " + destName + " to " + dest)
-            ant.copy(file: destName, tofile: new File(dest, it))
-        }
-    }
-}
-
-// unzip eclipse prebuilts into the out folder to create a target platform for the build
-task unzipTargetPlatform << {
-    File targetDir = new File(outFile, "/host/maven/target").getCanonicalFile()
-    targetDir.mkdirs()
-
-    project.targetComponents.each { String k, File v ->
-        File d = new File(targetDir, k)
-        logger.info("Unzipping " + v.getPath() + " into: " + d.getPath())
-        ant.unzip(src: v, dest: d)
-    }
-}
-
-task buildEclipse(type: Exec, dependsOn: unzipTargetPlatform) {
-    def maven = new File(projectDir, "../../prebuilts/eclipse/maven/apache-maven-3.2.1/bin/mvn").getCanonicalFile()
-    def androidOut = outFile.getCanonicalPath()
-    environment("M2_HOME", maven.getParentFile().getParentFile().getCanonicalPath())
-    workingDir projectDir
-    commandLine maven.getCanonicalPath(), "-s", "settings.xml", "-DforceContextQualifier=$project.buildNumber", "-DANDROID_OUT=$androidOut", "package"
-}
-
-private File getArtifact(ResolvedDependency dependency) {
-    if (dependency.moduleArtifacts.size() != 1) {
-        String msg = String.format("Each dependency is expected to map to a single jar file, " +
-                "but %s maps to the following artifacts: %s",
-                dependency,
-                dependency.moduleArtifacts.collect { it.file })
-        throw new RuntimeException(msg);
-    }
-
-    return dependency.moduleArtifacts.iterator().next().file
-}
-
-// parse a plugin's manifest file and return the list of jar dependencies expected to be
-// bundled inside
-private List<String> getManifestDependencies(File manifest) {
-    if (manifest == null || !manifest.exists()) {
-        return []
-    }
-
-    def entries = []
-
-    def fis = new FileInputStream(manifest)
-    try {
-        java.util.jar.Manifest m = new java.util.jar.Manifest(fis)
-        def classPath = m.getMainAttributes().getValue("Bundle-ClassPath")
-        if (classPath == null) {
-            return []
-        }
-
-        classPath.split(',').each {
-            if (!it.equals(".")) {
-                if (!it.startsWith("libs/") || !it.endsWith(".jar")) {
-                    throw new RuntimeException(
-                            "Unexpected classpath entry: " + it + " in file: " + manifest)
-                }
-
-                entries.add(it.substring("libs/".length()))
-            }
-        }
-    } finally {
-        fis.close()
-    }
-
-    return entries
-}
diff --git a/eclipse/buildConfig/allElements.xml b/eclipse/buildConfig/allElements.xml
deleted file mode 100644
index b3b5c4e..0000000
--- a/eclipse/buildConfig/allElements.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- ========================================================================= -->
-<!-- Feature build ant targets                                                 -->
-<!-- Template obtained from org.eclipse.pde.build/templates/headless-build     -->
-<!-- ========================================================================= -->
-<project name="allElements Delegator">
-
-     <!-- ===================================================================== -->
-     <!-- Run a given ${target} on all elements being built                     -->
-     <!-- Replace element.id with the id of the top level element being built.    -->
-     <!-- If element.id does not exist in ${buildDirectory}/features/element.id   -->
-     <!-- or ${baseLocation}/features/element.id, then you must provide the       -->
-     <!-- location by setting the property "pluginPath"                           -->
-     <!-- Add on <ant> task for each top level element being built.             -->
-     <!-- ===================================================================== -->
-     <target name="allElementsDelegator">
-
-         <ant antfile="${genericTargets}" target="${target}">
-             <property name="type" value="feature" />
-             <property name="id" value="com.android.ide.eclipse.ddms" />
-         </ant>
-
-         <ant antfile="${genericTargets}" target="${target}">
-             <property name="type" value="feature" />
-             <property name="id" value="com.android.ide.eclipse.hierarchyviewer" />
-         </ant>
-
-         <ant antfile="${genericTargets}" target="${target}">
-             <property name="type" value="feature" />
-             <property name="id" value="com.android.ide.eclipse.adt" />
-         </ant>
-
-         <ant antfile="${genericTargets}" target="${target}">
-             <property name="type" value="feature" />
-             <property name="id" value="com.android.ide.eclipse.ndk" />
-         </ant>
-
-         <ant antfile="${genericTargets}" target="${target}">
-             <property name="type" value="feature" />
-             <property name="id" value="com.android.ide.eclipse.traceview" />
-         </ant>
-
-        <ant antfile="${genericTargets}" target="${target}">
-            <property name="type" value="feature" />
-            <property name="id" value="com.android.ide.eclipse.gldebugger" />
-        </ant>
-
-         <antcall target="buildInternalFeatures"/>
-     </target>
-
-     <!-- ===================================================================== -->
-     <!-- Conditional target for building the internal features                 -->
-     <!-- Builds if property internalSite is set                                -->
-     <!-- ===================================================================== -->
-     <target name="buildInternalFeatures" if="internalSite">
-        <ant antfile="${genericTargets}" target="${target}">
-            <property name="type" value="feature" />
-            <property name="id" value="com.android.ide.eclipse.tests" />
-        </ant>
-
-        <ant antfile="${genericTargets}" target="${target}">
-            <property name="type" value="feature" />
-            <property name="id" value="com.android.ide.eclipse.pdt" />
-        </ant>
-     </target>
-
-     <!-- ===================================================================== -->
-     <!-- Targets to assemble the built elements for particular configurations  -->
-     <!-- These generally call the generated assemble scripts (named in         -->
-     <!-- ${assembleScriptName}) but may also add pre and post processing       -->
-     <!-- Add one target for each root element and each configuration           -->
-     <!-- Replace element.id with the id of the top level element being built   -->
-     <!-- ===================================================================== -->
-     <target name="assemble.com.android.ide.eclipse.base">
-         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-     </target>
-
-     <target name="assemble.com.android.ide.eclipse.adt">
-         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-     </target>
-
-     <target name="assemble.com.android.ide.eclipse.adt.overlay">
-         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-     </target>
-
-     <target name="assemble.com.android.ide.eclipse.ndk">
-         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-     </target>
-
-     <target name="assemble.com.android.ide.eclipse.ddms">
-         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-     </target>
-
-    <target name="assemble.com.android.ide.eclipse.tests">
-        <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-    </target>
-
-    <target name="assemble.com.android.ide.eclipse.hierarchyviewer">
-        <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-    </target>
-
-    <target name="assemble.com.android.ide.eclipse.pdt">
-        <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-    </target>
-
-    <target name="assemble.com.android.ide.eclipse.traceview">
-        <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-    </target>
-
-    <target name="assemble.com.android.ide.eclipse.gldebugger">
-        <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-    </target>
-</project>
diff --git a/eclipse/buildConfig/build.properties b/eclipse/buildConfig/build.properties
deleted file mode 100644
index 4c1d471..0000000
--- a/eclipse/buildConfig/build.properties
+++ /dev/null
@@ -1,239 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-
-# This file was generated per the instructions located in Eclipse Help>Plug-in Development
-# Environment >  Guide > Tasks > Building features and customized for building the
-# Android Eclipse plugins.
-
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    bootclasspath - The base jars to compile against (typicaly rt.jar)
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# PRODUCT/PACKAGING CONTROL #############
-product=/plugin or feature id/path/to/.product
-runPackager=true
-
-#Set the name of the archive that will result from the product build.
-#archiveNamePrefix=
-
-# The prefix that will be used in the generated archive.
-# override default of "eclipse" to aid for external site generation 
-archivePrefix=android-eclipse
-
-# The location underwhich all of the build output will be collected.
-collectingFolder=${archivePrefix}
-
-# The list of {os, ws, arch} configurations to build.  This 
-# value is a '&' separated list of ',' separate triples.  For example, 
-#     configs=win32,win32,x86 & linux,motif,x86
-# By default the value is *,*,*
-configs = *, *, *
-#configs=win32, win32, x86 & \
-#	linux, gtk, ppc &\
-# linux, gtk, x86 & \
-#	linux, gtk, x86_64 & \
-#	linux, motif, x86 & \
-#	solaris, motif, sparc & \
-#	solaris, gtk, sparc & \
-#	aix, motif, ppc & \
-#	hpux, motif, PA_RISC & \
-#	macosx, carbon, ppc
-
-# By default PDE creates one archive (result) per entry listed in the configs property.
-# Setting this value to try will cause PDE to only create one output containing all 
-# artifacts for all the platforms listed in the configs property.
-#groupConfigurations=true
-
-#The format of the archive. By default a zip is created using antZip.
-#The list can only contain the configuration for which the desired format is different than zip.
-#archivesFormat=win32, win32, x86 - antZip& \
-#	linux, gtk, ppc - antZip &\
-#    linux, gtk, x86 - antZip& \
-#	linux, gtk, x86_64 - antZip& \
-# linux, motif, x86 - antZip& \
-#	solaris, motif, sparc - antZip& \
-#	solaris, gtk, sparc - antZip& \
-#	aix, motif, ppc - antZip& \
-#	hpux, motif, PA_RISC - antZip& \
-#	macosx, carbon, ppc - antZip
-	
-#Set to true if you want the output to be ready for an update jar (no site.xml generated)
-outputUpdateJars = true
-
-#Set to true for Jnlp generation
-#codebase should be a URL that will be used as the root of all relative URLs in the output.
-#generateJnlp=false
-#jnlp.codebase=<codebase url>
-#jnlp.j2se=<j2se version>
-#jnlp.locale=<a locale>
-#jnlp.generateOfflineAllowed=true or false generate <offlineAllowed/> attribute in the generated features
-#jnlp.configs=${configs}			#uncomment to filter the content of the generated jnlp files based on the configuration being built
-
-#Set to true if you want to sign jars
-#signJars=false
-#sign.alias=<alias>
-#sign.keystore=<keystore location>
-#sign.storepass=<keystore password>
-
-#Arguments to send to the zip executable
-zipargs=
-
-#Arguments to send to the tar executable
-tarargs=
-
-#Control the creation of a file containing the version included in each configuration - on by default 
-#generateVersionsLists=false
-
-############## BUILD NAMING CONTROL ################
-# The directory into which the build elements are fetched and where
-# the build takes place.
-buildDirectory=.
-
-# Type of build.  Used in naming the build output.  Typically this value is
-# one of I, N, M, S, ...
-buildType=build
-
-# ID of the build.  Used in naming the build output.
-# forceContextQualifer = build label
-buildId=${forceContextQualifier}
-
-# Label for the build.  Used in naming the build output
-buildLabel=${buildId}
-
-# Timestamp for the build.  Used in naming the build output
-timestamp=007
-
-#The value to be used for the qualifier of a plugin or feature when you want to override the value computed by pde.
-#The value will only be applied to plugin or features indicating build.properties, qualifier = context 
-#forceContextQualifier=<the value for the qualifier>
-
-#Enable / disable the generation of a suffix for the features that use .qualifier. 
-#The generated suffix is computed according to the content of the feature   
-#generateFeatureVersionSuffix=true
-
-############# BASE CONTROL #############
-# Settings for the base Eclipse components and Java class libraries 
-# against which you are building.
-# Base location for anything the build needs to compile against.  For example,
-# in most RCP app or a plug-in,  the baseLocation should be the location of a previously
-# installed Eclipse against which the application or plug-in code will be compiled and the RCP delta pack.
-
-baseLocation=${ECLIPSE_HOME}
-#Os/Ws/Arch/nl of the eclipse specified by baseLocation
-# Note: These default values may be overridden by the build_plugins script
-baseos=linux
-basews=gtk
-basearch=x86
-
-#this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
-filteredDependencyCheck=false
-
-#this property indicates whether the resolution should be done in development mode (i.e. ignore multiple bundles with singletons)
-resolution.devMode=false
-
-#pluginPath is a list of locations in which to find plugins and features.  This list is separated by the platform file separator (; or :)
-#a location is one of:  
-#- the location of the jar or folder that is the plugin or feature : /path/to/foo.jar or /path/to/foo
-#- a directory that contains a /plugins or /features subdirectory
-#- the location of a feature.xml, or for 2.1 style plugins, the plugin.xml or fragment.xml
-#pluginPath=
-
-skipBase=true
-eclipseURL=<url for eclipse download site>
-eclipseBuildId=<Id of Eclipse build to get>
-eclipseBaseURL=${eclipseURL}/eclipse-platform-${eclipseBuildId}-win32.zip
-
-
-############# MAP FILE CONTROL ################
-# This section defines CVS tags to use when fetching the map files from the repository.
-# If you want to fetch the map file from repository / location, change the getMapFiles target in the customTargets.xml
-
-skipMaps=true
-mapsRepo=:pserver:anonymous@example.com/path/to/repo
-mapsRoot=path/to/maps
-mapsCheckoutTag=HEAD
-
-#tagMaps=true
-mapsTagTag=v${buildId}
-
-
-############ REPOSITORY CONTROL ###############
-# This section defines properties parameterizing the repositories where plugins, fragments
-# bundles and features are being obtained from. 
-
-# The tags to use when fetching elements to build.
-# By default thebuilder will use whatever is in the maps.  
-# This value takes the form of a comma separated list of repository identifier (like used in the map files) and the 
-# overriding value
-# For example fetchTag=CVS=HEAD, SVN=v20050101
-# fetchTag=HEAD
-skipFetch=true
-
-
-############# JAVA COMPILER OPTIONS ##############
-# The location of the Java jars to compile against.  Typically the rt.jar for your JDK/JRE
-#bootclasspath=${java.home}/lib/rt.jar
-
-# specific JRE locations to compile against. These values are used to compile bundles specifying a 
-# Bundle-RequiredExecutionEnvironment. Uncomment and set values for environments that you support
-#CDC-1.0/Foundation-1.0= /path/to/rt.jar
-#CDC-1.1/Foundation-1.1=
-#OSGi/Minimum-1.0=
-#OSGi/Minimum-1.1=
-#JRE-1.1=
-#J2SE-1.2=
-#J2SE-1.3=
-#J2SE-1.4=
-#J2SE-1.5=
-#JavaSE-1.6=
-#PersonalJava-1.1=
-#PersonalJava-1.2=
-#CDC-1.0/PersonalBasis-1.0=
-#CDC-1.0/PersonalJava-1.0=
-#CDC-1.1/PersonalBasis-1.1=
-#CDC-1.1/PersonalJava-1.1=
-
-# Specify the output format of the compiler log when eclipse jdt is used
-logExtension=.log
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=true
-
-# Enable or disable verbose mode of the compiler
-javacVerbose=true
-
-# Extra arguments for the compiler. These are specific to the java compiler being used.
-compilerArg=-warn:none
-
-# Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties
-javacSource=1.6
-
-# Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
-javacTarget=1.6
-
-################### CUSTOM PROPERTIES #######################################
-# repository location for update site
-# comment out - this is passed in from command line 
-#updateSiteSource=${buildDirectory}/sites/external
-# where to place update site build
-updateSiteRoot=${user.home}/www/no_crawl/
-updateSiteFolder=${archivePrefix}
-updateSiteDestination=${updateSiteRoot}/${updateSiteFolder}
diff --git a/eclipse/buildConfig/buildUpdateSite.xml b/eclipse/buildConfig/buildUpdateSite.xml
deleted file mode 100644
index 1ab7c99..0000000
--- a/eclipse/buildConfig/buildUpdateSite.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<project name="update site">
-    <!-- ========================================================================= -->
-    <!-- Extracts feature zip for update site                                      -->
-    <!-- expected properties:                                                      -->
-    <!--    id - feature id to extract                                             -->
-    <!--    buildDirectory - base directgory where build takes place               -->
-    <!--    buildLabel - build id label                                            -->
-    <!--    updateSiteRoot - where to extract feature zip                          -->
-    <!-- ========================================================================= -->
-    <target name="extractFeature">
-        <unzip src="${buildDirectory}/${buildLabel}/${id}-${buildLabel}.zip" dest="${updateSiteRoot}"/>        
-    </target>
-</project>
diff --git a/eclipse/buildConfig/customTargets.xml b/eclipse/buildConfig/customTargets.xml
deleted file mode 100644
index 5a46bfc..0000000
--- a/eclipse/buildConfig/customTargets.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<!-- ========================================================================= -->
-<!-- Eclipse template file for PDE builds -->
-<!-- template originally obtained from org.eclipse.pde.build/templates/headless-build -->
-<!-- ========================================================================= -->
-<project name="Build specific targets and properties" default="noDefault">
-
-    <!-- ===================================================================== -->
-    <!-- Run a given ${target} on all elements being built -->
-    <!-- Add on <ant> task for each top level element being built. -->
-    <!-- ===================================================================== -->
-    <property name="allElementsFile" value="${builder}/allElements.xml"/>
-    <import file="${allElementsFile}" />
-    <target name="allElements">
-        <antcall target="allElementsDelegator" />
-    </target>
-    
-    <!-- ===================================================================== -->
-    <!-- ===================================================================== -->
-    <target name="getBaseComponents" depends="checkLocalBase" unless="skipBase">
-        <get src="${eclipseBaseURL}" dest="${buildDirectory}/../temp-base.zip" />
-        <unzip dest="${base}" overwrite="true" src="${buildDirectory}/../temp-base.zip" />
-    </target>
-
-    <target name="checkLocalBase">
-        <available file="${base}" property="skipBase" />
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Check out map files from correct repository -->
-    <!-- Replace values for mapsCheckoutTag as desired. -->
-    <!-- ===================================================================== -->
-    <target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
-        <property name="mapsCheckoutTag" value="HEAD" />
-        <cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
-    </target>
-
-    <target name="checkLocalMaps">
-        <available property="skipMaps" file="${buildDirectory}/maps" />
-    </target>
-
-    <target name="tagMapFiles" if="tagMaps">
-        <cvs dest="${buildDirectory}/maps/${mapsRoot}" command="tag ${mapsTagTag}" />
-    </target>
-
-    <!-- ===================================================================== -->
-
-    <target name="clean" unless="noclean">
-        <antcall target="allElements">
-            <param name="target" value="cleanElement" />
-        </antcall>
-    </target>
-
-    <target name="gatherLogs">
-        <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-        <antcall target="allElements">
-            <param name="target" value="gatherLogs" />
-        </antcall>
-        <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-            <fileset dir="${buildDirectory}/features">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do before setup -->
-    <!-- ===================================================================== -->
-    <target name="preSetup">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after setup but before starting the build proper -->
-    <!-- ===================================================================== -->
-    <target name="postSetup">
-        <antcall target="getBaseComponents" />
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do before fetching the build elements -->
-    <!-- ===================================================================== -->
-    <target name="preFetch">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after fetching the build elements -->
-    <!-- ===================================================================== -->
-    <target name="postFetch">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do before generating the build scripts. -->
-    <!-- ===================================================================== -->
-    <target name="preGenerate">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after generating the build scripts. -->
-    <!-- ===================================================================== -->
-    <target name="postGenerate">
-        <antcall target="clean" />
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do before running the build.xmls for the elements being built. -->
-    <!-- ===================================================================== -->
-    <target name="preProcess">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after running the build.xmls for the elements being built. -->
-    <!-- ===================================================================== -->
-    <target name="postProcess">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do before running assemble. -->
-    <!-- ===================================================================== -->
-    <target name="preAssemble">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after  running assemble. -->
-    <!-- ===================================================================== -->
-    <target name="postAssemble">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do before running package. -->
-    <!-- ===================================================================== -->
-    <target name="prePackage">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after  running package. -->
-    <!-- ===================================================================== -->
-    <target name="postPackage">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after the build is done. -->
-    <!-- ===================================================================== -->
-    <target name="postBuild">
-        <antcall target="gatherLogs" />
-        <!-- Added this custom target ! -->
-        <antcall target="generateUpdateSite" />
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do to test the build results -->
-    <!-- ===================================================================== -->
-    <target name="test">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do to publish the build results -->
-    <!-- ===================================================================== -->
-    <target name="publish">
-        
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Default target                                                        -->
-    <!-- ===================================================================== -->
-    <target name="noDefault">
-        <echo message="You must specify a target when invoking this file" />
-    </target>
-    
-    <!-- ===================================================================== -->
-    <!-- Custom target:                                                        -->
-    <!-- Steps to do to generate the update site                               -->
-    <!-- ===================================================================== -->
-    <target name="generateUpdateSite">
-        <echo message="Copying update site source ${updateSiteSource} to destination"/>
-    	
-        <copy file="${updateSiteSource}/site.xml" overwrite="true" todir="${updateSiteDestination}"/>
-        <copy file="${updateSiteSource}/index.html" overwrite="true" todir="${updateSiteDestination}"/>
-        <copy file="${updateSiteSource}/web/site.css" overwrite="true" todir="${updateSiteDestination}/web"/>
-        <copy file="${updateSiteSource}/web/site.xsl" overwrite="true" todir="${updateSiteDestination}/web"/>
-        
-        <!-- replace qualifier version references with build label -->
-        <replace file="${updateSiteDestination}/site.xml" token="qualifier" value="${buildId}"/>
-        
-        <!-- now extract each features zip to update site -->
-        <antcall target="allElements">
-            <param name="genericTargets" value="${builder}/buildUpdateSite.xml"/>
-            <param name="target" value="extractFeature" />
-        </antcall>
-        
-        <chmod perm="755" type="both">
-            <fileset dir="${updateSiteDestination}">
-            </fileset>
-        </chmod>    
-    </target>
-
-</project>
diff --git a/eclipse/changes.txt b/eclipse/changes.txt
deleted file mode 100644
index aeec5cc..0000000
--- a/eclipse/changes.txt
+++ /dev/null
@@ -1,868 +0,0 @@
-21.0.0
-* Bug fixes.
-* JUnit test runner allows a test to be run on all devices
-* XML code completion can now complete (and show documentation for)
-  theme references, such as ?android:attr/dividerHeight
-* Improved flag and locale data in the configuration chooser
-* New lint checks:
-  * Find misspellings in English string files
-  * Detect certain types of wakelock mistakes leading to unnecessary
-    battery usage
-  * Find private key files placed in directories where they end up
-    getting bundled with the .apk
-  * Find usages of "dp" units with the font property textSize
-  * Find invalid selector files where a later state is fully covered
-    by an earlier state and is therefore unreachable
-  * Find incorrect use of the SecureRandom object (where it is
-    initialized with a fixed seed)
-  Various lint infrastructure improvements.
-
-20.0.0
-* A lot of bug fixes, performance fixes and memory fixes.
-* Support for Eclipse 4.x.
-* Build System
-  * Automatic merging of library project manifest files into the
-    including project's manifest. Enable with the
-    manifestmerger.enabled property.
-  * Automatic ProGuard support for the aapt -G flag. This means that
-    the build system will generate a temporary ProGuard keep-rules
-    file containing classes to keep that are referenced from XML files
-    (such as custom views) and pass this to ProGuard at
-    shrink-time. This can make the resulting APK much smaller when
-    using just a small portion of a large library project (such as the
-    Android Support library), since we have also removed the catch-all
-    rules to keep all custom views from the default ProGuard
-    configuration file.
-   * Aidl files from library projects are now in the import list.
-   * Fixes in Ant:
-     * Test projects now have access to the full classpath from the
-       tested projects, including Library Projects and 3rd party jar
-     * Applications embedding tests can now be deployed and tested,
-       including with code coverage, like test applications.
-* Lint
-  * Tighter integration with the layout editor (error and warning
-    icons overlaid views with errors, lint error messages shown as
-    tooltips in the layout canvas and in the outline, error count
-    displayed in the layout actions bar.)
-  * Lint is run incrementally in Java files on save, just like XML
-    files already are.
-  * New lint rules:
-  * Detect usages of Toast.makeText() without calling show() on the
-    result, as well as passing invalid duration parameters (e.g. a
-    number instead of one of the two allowed constants.)
-  * Detect incorrect manifest registrations (where elements such as
-    <uses-library>, <activity> etc are placed under the wrong parent.)
-  * Several security checks: Look for exported content providers
-    without required permissions, look for creation of world readable
-    files and preferences, look for calls to
-    android.webkit.WebSettings.setJavaScriptEnabled.
-  * Check to make sure that Fragment classes are instantiatable. If
-    you accidentally make a fragment innerclass non-static, or forget
-    to have a default constructor, you can hit runtime errors when the
-    system attempts to reinstantiate your fragment after a
-    configuration change.
-  * Look for handler leaks: This check makes sure that a handler inner
-    class does not hold an implicit reference to its outer class.
-  * Duplicate Activity registrations in the manifest. This can lead to
-    subtle errors that can be difficult to understand.
-  * Lint check ensuring that when you edit() a SharedPreference object
-    you call commit()
-* Layout Editor
-  * New property sheet implementation, which offers:
-    * Highlighting (in bold) for important attributes.
-    * Inline preview of colors and images, as well as the
-      corresponding resource name.
-    * Displays default values, when available.
-    * Completion of resource values and enum and flag constants.
-    * Support for showing and hiding "advanced" properties.
-    * Nested properties (and collapse all and expand all) for better
-      categorization. For example, layout params are listed first as a
-      single nested property.
-    * Tooltips over the attribute names, not values, so they never
-      obscure the value column.
-    * Checkbox support for boolean values.
-    * Support for switching between alphabetical and natural sort
-      orders.
-  * New window management. The propertysheet is now automatically
-    docked into the Outline view, and the outline can appear in a
-    maximized editor. The structure and palette views can be minimized
-    and appear temporarily on flyover.
-  * New configuration chooser above the layout editor, which in
-    addition to a visual refresh offers an activity chooser, a nested
-    theme chooser, a single button to flip orientation, better
-    wrapping behavior, etc.
-* SDK Manager:
-  * Cache to avoid downloading repository definitions all the time.
-  * New "Tools > Manage Add-on Sites" option that allows deactivating
-    3rd party sites (e.g. if one or more are temporarily slow to
-    load.)
-* NDK integration (alpha):
-  * Initial support for building and debugging projects with C/C++
-    code.
-  * To enable this, install the NDK feature (depends on CDT), and then
-    set the path to NDK in Android Preferences.
-  * Add NDK nature to an Android project by right clicking on the
-    project and select "Android Tools -> Add Native Support".
-  * To debug an NDK project, just right click and select "Debug As
-    Android Native Application".
-* Execution
-  * LogCat: Allow users to set colors for different priorities
-  * LogCat: Ctrl + F now brings up a Find dialog to find items (rather
-    than filter)
-  * Allow running on multiple devices with a single launch. The target
-    tab in the launch configuration dialog adds a new option which
-    allows launching on all connected devices, and a drop down allows
-    the user to further narrow down the list to just physical devices
-    or just emulators. (This applies only to Run configurations, not
-    to Debug/JUnit tests.)
-* XML Editing
-  * Code completion support for custom attributes on custom views.
-  * Go to Declaration now works for theme references (?android:attr,
-    ?attr: etc,)
-  * Completion of the minSdkVersion and targetSdkVersion attributes in
-    manifest files now include version descriptions for each of the
-    API levels
-  * Support XML editor outlines for layout files. Switching back and
-    forth between the text editor and graphical editor will alternate
-    between the two outlines, and in particular the XML editor outline
-    will keep up to date with edits in the editor, and selection will
-    follow the mouse cursor etc.
-* The Asset Studio Wizard now supports padding and disabling
-  background shapes
-
-19.0.0 (does not exist)
-
-18.0.0
-* Fix bug 27940 where exporting release package doesn't recompile libraries
-  in release mode.
-
-17.0.0:
-* ADT 17 requires Java 6 and Eclipse 3.6.2.
-* Improved Lint UI.
-   * Many new lint checks: See the tools changes.txt for details.
-   * New "Run Lint" toolbar action with a dropdown menu for selecting
-     specific (or all) projects, clearing results, etc.
-   * The results window is now organized as a tree rather than a flat
-     list. Each issue type has a single top level item, which makes it
-     easier to quickly scan through the reported issues and narrow
-     down to issues you are most interested in.
-   * The results window contains many new toolbar actions, including
-     expand/collapse, ignore in file, ignore in project, ignore
-     everywhere, show options, and configure columns.
-   * There are new columns available, such as category, priority,
-     project, file and line. The column selection (as well as the
-     column sizes) are persisted. You can click on columns to sort by
-     that column.
-   * The Lint Options dialog has Enable All and Disable All buttons,
-     and a search filter textbox to filter by issue id, summary and
-     severity.
-* New Quick Outline for XML editors (Ctrl-O, Command-O). This shows
-  the structure of the current file including icons and ids, and lets
-  you filter and quickly jump to specific ids.
-* The resource chooser now shows the resolved value for resources
-  (e.g. when selecting @string/hello it displays that the resolved value
-  is "Hello World"). It also allows editing the chosen value directly.
-* The layout editor no longer assigns default ids to layouts, includes
-  and merge tags. This tended to pollute the namespace with a lot of
-  unused resources since layouts aren't usually manipulated via code,
-  or referenced from XML. (The RelativeLayout editor automatically
-  assigns ids to views without ids when pointing to them.)
-* Export Screenshot from the Layout Editor
-* Layout editor fix for SlidingDrawer which on some platforms could
-  not be dragged into the layout. Also fix preview rendering for
-  SlidingDrawer and TabHost (issue 23022).
-* New default application icons, including an xhdpi version.
-* Important bug fixes:
-  * Fix bug in resource chooser which made some types of framework
-    resources impossible to select (issue 20589)
-  * Fix a bug in the formatter where a certain whitespace pattern
-    could result in a non-space character getting deleted (issue
-    23940)
-  * Fix locale bug affecting Turkish locales in particular (issue
-    23747)
-
-16.0.0:
-* New "lint" feature which scans the Android projects for potential
-  problems such as missing translations, duplicate ids between layouts
-  that include each other, using px instead of dp units, hardcoded
-  strings, missing contentDescriptions, obsolete Proguard
-  configuration files, etc. Lint can be run on the command line, but
-  it is also integrated into the Problems view in Eclipse, and there
-  are also quickfixes available for many of the reported errors.
-
-15.0.0
-Critical bug fixes only.
-
-14.0.0
-- Build system:
-  - (TODO: More info) Improved library projects
-  - Improved incremental builds
-    - Resource compilation is run much less frequently. It is no
-      longer run when strings are edited, or when layouts are edited
-      (unless a new id is introduced), and it is no longer run once
-      per library project (!)
-    - Resource compilation is no longer done for normal save
-      operations, only when running or debugging (option added in ADT
-      12 now on by default.)
-    - There is a new "PNG crunch cache", which means image crunching
-      is only done once, not once per build which is significant for
-      projects with many resources
-    - Incremental ant builds
-  - ADT now uses bin/classes to output the java compilation
-    and bin/ for Android specific classes. This will make bin show up
-    in the package explorer.
-- DDMS
-  - Brand new logcat view. Fixes bugs, displays and filters by
-    application names instead of just pids, fronts when application
-    runs.
-- XML Editing
-  - New XML formatter which formats all XML files according to the
-    standard Android coding style. The formatter can also reorder
-    attributes to follow the recommended order.
-  - Improved "smart indent": automatic indentation and un-indentation
-    when pressing Return in XML editors
-  - Go to Matching (Ctrl-Shift-P) in XML files can now jump between
-    opening and closing tags
-  - Changes made by the layout editor are automatically run through
-    the new XML formatter.
-  - Select Enclosing Element should now work on the Mac as well.
-- Java Editing
-  - Quickfix for extracting Strings when the caret is inside a String
-- Layout Editor
-  - New GridLayout support
-  - Tooltip feedback for resizing and dragging operations. For
-    example, when dragging in a relative layout, the proposed
-    constraints are shown, and when resizing the new dimensions are
-    shown.
-  - New "Remove Container" visual refactoring which removes the
-    children of a container up to the top level and transfers
-    namespace and layout attributes if necessary.
-  - Improved access to properties in the context menu: The most
-    frequently set attributes for each view are listed at the top of
-    the menu, and the properties menu offers access to the most
-    recently set attributes, attributes organized by their defining
-    view, and layout attributes only or all attributes alphabetically.
-  - The context menu now also contains pull-right menus for accessing
-    properties of the parents, which is useful when the children fully
-    cover the parent making it hard to select on its own.
-  - Ability to suppress rendering fidelity warnings.
-- Asset Studio integration: Wizard creation of launcher icons, menu
-    icons, tab icons, etc.
-- New Welcome Wizard to help installing and configuring the SDK
-  platforms.
-- The New Project and the New XML File wizards have been reworked into
-  multiple pages. Sample Projects are now copied into the workspace
-  such that they can be modified and deleted without affecting the
-  master copy.
-- The dependency on Eclipse GEF was removed.
-- Many bug fixes, and in particular some critical bug fixes on Linux
-
-13.0.0
-- Tools release only (command line tools)
-
-12.0.0 (July 6th, 2011)
-- Many bug fixes!
-- Visual Layout Editor:
-  - New RelativeLayout drop support with guideline suggestions for
-    attachments and cycle prevention.
-  - Resize support in most layouts. In LinearLayout, sizes are mapped
-    to weights. Guideline snapping to wrap_content and match_parent.
-  - Previews of drawables and colors in the resource chooser dialogs.
-  - Improved error messages and links for rendering errors, including
-    detection of misspellings of class names.
-- Build system: Delay post compiler phase until actual export or debug
-  to speed up interactive file saves. (This is off by default but can
-  be enabled in the ADT options panel.)
-
-11.0.0 (June 6th, 2011)
-- Visual Refactoring:
-  - The new "Extract Style" refactoring pulls out style constants and
-    defines them as style rules instead.
-  - The new "Wrap in Container" refactoring surrounds the selected
-    views with a new layout, and transfers namespace and layout
-    parameters to the new parent
-  - The new "Change Widget Type" refactoring changes the type of the
-    selected views to a new type. (Also, a new selection context menu
-    in the visual layout editor makes it easy to select siblings as
-    well as views anywhere in the layout that have the same type).
-  - The new "Change Layout" refactoring changes layouts from one type
-    to another, and can also flatten a layout hierarchy.
-  - The "Extract as Include" refactoring now finds identical fragments
-    in other layouts and offers to combine all into a single include.
-  - There is a new Refactoring Quick Assistant which can be invoked
-    from the XML editor (with Ctrl-1) to apply any of the above
-    refactorings (and Extract String) to the current selection.
-- Visual Layout Editor:
-  - Improved "rendering fidelity": The layout preview has been
-    improved and should more closely match the rendering on actual
-    devices.
-  - The visual editor now previews ListViews at designtime.  By
-    default, a two-line list item is shown, but with a context menu
-    you can pick any arbitrary layout to be used for the list items,
-    and you can also pick the header and footer layouts.
-  - The palette now supports "configurations" where a single view is
-    presented in various different configurations. For example, there
-    is a whole "Textfields" palette category where the EditText view
-    can be dragged in as a password field, an e-mail field, a phone
-    field, and so on. Similarly, TextViews are offered preconfigured
-    with large, normal and small theme sizes, and LinearLayouts are
-    offered both in horizontal and vertical configurations.
-  - The palette supports custom views, picking up any custom
-    implementations of the View class in your project source folders
-    or in included libraries, and these can be dragged into layouts.
-  - Fragments support: Fragments are available in the palette, and in
-    the tool you can choose which layout to show rendered for a given
-    fragment tag. Go to declaration works for fragment classes.
-  - The layout editor automatically applies a "zoom to fit" for newly
-    opened files as well as on device size and orientation changes to
-    ensure that large layouts are always fully visible unless you
-    manually zoom in.
-  - You can drop an "include" tag from the palette, which will pop up
-    a layout chooser, and the chosen layout is added as an include.
-    Similarly, dropping images or image buttons will pop up image
-    resource choosers to initialize the new image with.
-  - The configuration chooser now applies the "Render Target" and
-    "Locale" settings project wide, making it trivial to check the
-    layouts for different languages or render targets without having
-    to configure these individually for each layout.
-  - The layout editor is smarter about picking a default theme to
-    render a layout with, consulting factors like theme registrations
-    in the manifest, the SDK version, etc.
-  - The layout editor is also smarter about picking a default
-    configuration to render a layout with, defaulting to the currently
-    visible configuration in the previous file. It also considers the
-    SDK target to determine whether to default to a tablet or phone
-    screen size.
-  - Basic focus support: The first text field dropped in a layout is
-    assigned focus, and there are "Request Focus" and "Clear Focus"
-    context menu items on text fields to change the focus.
-- XML editors:
-  - Code completion has been significantly improved. It now works
-    within <style> elements, it completes dimensional units,
-    it sorts resource paths in values based on the attribute name,
-    etc. There are also many fixes to handle text replacement.
-  - AAPT errors are handled better. They are now underlined for the
-    relevant range in the editor, and a new quickfix makes it trivial
-    to create missing resources.
-  - Code completion for drawable, animation and color XML files.
-- DDMS:
-  - "New Folder" action in the File Explorer
-  - The screenshot dialog will add timestamps to the filenames, and
-    preserve the orientation on snapshot refresh
-- TraceView: Mouse-wheel zoom support in the timeline
-- The New Android Project wizard now supports Eclipse working sets
-- Most of the tools have improved integration with the Mac OSX
-  system menu bar.
-- Most of the tools have new launcher icons.
-
-10.0.1 (March, 2011)
-- Temporary work-around to resolve the rare cases in which the layout
-  editor will not open.
-- Fix issue in which ADT 10.0.0 would install on Eclipse 3.4 and
-  lower, even though ADT requires Eclipse 3.5 or higher (as of
-  10.0.0).
-
-10.0.0 (February 22nd, 2011)
-- The tools now automatically generate Java Programming Language
-  source files (in the gen/ directory) and bytecode (in the res/raw/
-  directory) from your .rs files.
-- A Binary XML editor has been added.
-- Traceview is now integrated into the Eclipse UI.
-- The "Go To Declaration" feature for XML and .java files quickly show
-  all the matches in the project and allows you jump to specific items
-  such as string translations or onClick handlers.
-- The Resource Chooser can create items such as dimensions, integers,
-  ids, and booleans.
-- Improvements to the Visual Layout Editor:
-  - A new Palette with categories and rendering previews.
-  - A Layout Actions bar that provides quick access to common layout
-    operations.
-  - When the Android 3.0 rendering library is selected, layouts render
-    more like they do on devices. This includes rendering of status
-    and title bars to more accurately reflect the actual screen space
-    available to applications.
-  - Zoom improvements such as fit to view, persistent scale, and
-    keyboard access..
-  - Further improvements to <merge> layouts, as well as layouts with
-    gesture overlays.
-  - Improved rendering error diagnostics.
-
-9.0.0 (January 26, 2011)
-- Visual Layout Editor
-    - Empty layouts with 0,0 size are now automatically expanded when
-      selected and during drag and drop
-    - Rendering target can now be changed from the default (project
-      target)
-    - When choosing resources for rendering, the API level is properly
-      handled
-    - Improved support for rendering <include> and <merge> views
-    - "Extract as Include" refactoring to extract selected views into
-      a separate included layout.
-    - String and reference properties can be edited from the layout
-      editor's context menu
-    - Rewritten outline drag & drop handling, improved label colors
-      and content
-    - The generated XML will be better formatted. Full XML formatter
-      can be enabled in the preferences (under Android > Editors), but
-      will touch part of the XML that isn't modified.
-    - Automatic configuration of many widgets on drop, such as
-      automatically filling a TextView in a vertical LinearLayout,
-      adding rows to new tables, etc.
-    - Double click views to jump to the corresponding XML declaration,
-      or for included views, to the included layout file
-    - Improved support for various views (such as TabHosts and
-      SlidingDrawers) when rendered using Honeycomb
-- Go to Declaration hyperlinks for navigating from @resource
-  references to their XML declarations, from the manifest file to
-  activity and service classes, from Java access of resource R fields
-  to the XML declarations, etc.
-- Logcat view in DDMS now properly displays UTF-8 characters.
-
-8.0.1 (October 2010)
-- Fix compilation issue in Android projects referencing standard Java
-  projects.
-- Better error reporting when exporting applications for release.
-
-8.0.0 (October 2010)
-- New version number scheme following the SDK Tools revision number.
-- Support for true debug build. No need to change the value of
-  debuggable in the Android Manifest.  Incremental build will
-  automatically insert debuggable==true while using the "export
-  signed/unsigned application package" will not.  If debuggable=true
-  is set, then release builds will actually do a debug build.
-- Automatic Proguard support in release builds. Only need to have a
-  proguard.config property in default.properties that points to a
-  proguard config file.
-- Completely rewritten Visual Layout Editor. This is very much a work
-  in progress.
-    - full drag and drop from palette to layout for all Layout
-      classes.
-    - Move widgets inside a Layout view, from one Layout view to
-      another and from one layout file to another.
-    - Contextual menu with enum/flag type properties.
-    - New zoom controls.
-- New HierarchyViewer plug-in integrated in Eclipse.
-- Android launch configurations don't recompile the whole workspace on
-  launch anymore.
-- android.jar source and javadoc location can now be configured.
-
-0.9.9:
-- Fix bug where ADT would delete the source folder of projects
-  imported from version control.
-
-0.9.8:
-- New Action "Rename Application Package" (under the "Android Tools"
-  contextual menu) will do a full application package refatoring.
-- Fixed issue with library project names containing characters that
-  aren't compatible with Eclipse path variable. The link between the
-  main project and the library would fail to create.
-- Added support for library projects that don't have a source folder
-  called "src". There is now support for any number of source folder,
-  with no name restriction. They can even be in sub folder such as
-  "src/java".
-- Added support for libraries with library dependencies.
-- added support for new resource qualifiers: car/desk, night/notnight
-  and navexposed/navhidden
-- Added more device screen types for the layout editor. All screen
-  resolution/density combinations from
-  http://developer.android.com/guide/practices/screens_support.html#range
-  is now available.
-
-0.9.7:
-- Support for library projects
-- Updated Property panel for Android project to edit library
-  dependencies.
-
-0.9.6:
-- Editing default.properties outside of eclipse will automatically
-  update the project
-- Fix issue when launching ADT the first time with the SDK Usage panel
-  that could create a deadlock between modal dialogs
-- Launched applications from ADT now behave as if they were clicked
-  from the Home screen of the emulator.
-- AVD creation dialog now enforce sd card of 9MB or higher
-- Fixed issue where add-on with no optional library would not show up
-  as valid targets for application launches.
-- Loads the SDK content only when a project requires it. This will
-  make Eclipse use less resources when the SDK contains many versions
-  of Android.
-- DDMS plug-in now contains the Allocation Tracker view.
-- Lots of fixes in the configuration selector of the Visual Layout
-  Editor.
-- Explode mode in the Visual Layout Editor adds a margin to all layout
-  objects so that it's easier to see embedded layouts
-- Outline mode in the Visual Layout Editor draws layout outline to
-  make it easier to see layout objects.
-- Fixed issues with the New Project Wizard when selecting samples.
-- Fixed possible crash when launching applications
-- New action in the Logcat view: "Go to problem" lets you go directly
-  from an exception trace output to the code.
-
-0.9.5:
-- Misc fixes in the SDK Updater
-
-0.9.4:
-- New "Create project from sample" choice in the New Project Wizard.
-- Improvements to the SDK Updater.
-- improvements to the AVD Manager (creation and launch dialogs)
-- new configuration selector in the Graphical Layout Editor
-
-0.9.3:
-- New wizard to create Android JUnit Test Projects.
-- New AVD wizard.
-- SDK Updater
-- zipalign support
-
-0.9.1:
-
-- Added an AVD creation wizard to ADT. It is automatically displayed
-  during a launch if no compatible AVDs are found.
-- Fixed issue with libs/ folder where files with no extension would
-  prevent the build from finishing.
-- Improved error handling during the final steps of the build to mark
-  the project if an unexpected error prevent the build from finishing.
-- Fixed issue when launching ADT on a clean install would trigger
-  org.eclipse.swt.SWTError: Not implemented [multiple displays].
-
-
-
-0.9.0:
-
-- Projects now store generated Java files (R.java/Manifest.java and
-  output from aidl) in a 'gen' source folder.
-- Support for the new Android SDK with support for multiple versions
-  of the Android platform and for vendor supplied add-ons.
-    * New Project Wizard lets you choose which platform/add-on to
-      target.
-    * Project properties (right click project in Package Explorer,
-      then "Properties"), lets you edit project target.
-    * New Launch configuration option to choose debug deployment
-      target.
-- Ability to export multiple apk from one project, using resource
-  filters. See the 'android' property for Android projects.
-- Support for running JUnit tests on a device/emulator from a new
-  "Android JUnit tests" launch configuration.
-
-0.8.1:
-
-- Alternate Layout wizard. In the layout editor, the "create" button
-  is now enabled to easily create alternate versions of the current
-  layout.
-- Fixed issue with custom themes/styles in the layout editor.
-- Export Wizard: To export an application for release, and sign it
-  with a non debug key. Accessible from the export menu, from the
-  Android Tools contextual menu, or from the overview page of the
-  manifest editor.
-- New XML File Wizard: To easily create new XML resources file in the
-  /res directory.
-- New checks on launch when attempting to debug on a device.
-- Basic support for drag'n'drop in Graphical layout editor. You can
-  add new items by drag'n'drop from the palette. There is no support
-  for moving/resizing yet.
-- Undo/redo support in all XML form editors and Graphical layout
-  editor.
-
-0.8.0:
-
-- Fixed issue with using custom classes implementing Parcelable in
-  aidl files. Right click the project and choose Android Tools >
-  Create aidl preprocess file for Parcelable Classes.
-- Added Custom Themes to theme drop down in the layout editor.
-- Customizable debug signing keystore path in preferences
-- Customizable HOME package name.
-
-0.7.1:
-
-- Layout Editor.
-
-0.6.1:
-- Fixed install issue when project name contains spaces (requires new
-  emulator image)
-- Fixed setup of the New class wizard in the manifest (when clicking
-  on "name" for a class attribute) in the cases where the class and
-  some of its parent packages were missing.
-- Properly kill the application that is about to be reinstalled.
-- Create missing android folder automatically when building
-  application (caused a signing error)
-- Manifest editor: support for uses-library node
-- Fixed NPE in editors.xml.descriptors.XmlDescriptors.createPreference
-- Fixed assert in MultiEditorPart.setActivePage
-- Fixed "connect to debugger" button in DeviceView. Also fixed support
-  for custom process names.
-
-0.6.0:
-
-- New launch option for activity. Can choose to launch default
-  activity (finds an activity configured to show up in the home
-  screen), or specific activity, or none.
-- Normal java resources (non java files placed in package folders) are
-  now properly packaged in the final package, and can be accessed
-  through normal java API such as ClassLoader.getResourceAsStream()
-- Launch configuration now has an option to wipe emulator data on
-  launch. This always asks for confirmation.
-- Launch configuration now has an option to disable the boot
-  animation. This will let the emulator start faster on older
-  computers.
-- Applications are now signed with a debug key (stored in
-  debug.keystore in ~/.android).
-- Installation of application is now more robust and will notify of
-  installation failure. Also installation is blocking, removing issues
-  where ADT tried to launch the activity before the app was installed.
-- Tree-based resource editor + content assist in XML editor for
-  layout, menu, preferences, values xml files. Work in progress...
-
-
-0.4.0 (adt 0.4.0, ddms 0.3.0, editors 0.2.0, common 0.1.0)
-
-- New AndroidManifest editor.
-- True multiple device support allowing debugging apps on several
-  device at the same time
-- New launch modes for device selection: automatic will launch an
-  emulator if no device are present, automatically target the device
-  if only one exists, and prompt the user if 2+ are connected. Manual
-  mode always prompt the user.
-- New classpath container remove the dependencies on the location of
-  android.jar making it easier to share a project through dsvn, cvs,
-  etc... You should fix your project (right click project, choose
-  Android > Fix Project properties)
-- Fixed a case where pm would fail and would up end outputting the
-  "usage" text, which would in turn confuse the plugin during parsing.
-- Fixed an issue with compiling aidl file when they import project
-  local files.
-
-
-0.3.4 (adt 0.3.4, ddms 0.2.3, editors 0.1.0)
-
-Internal release only.
-- Enabled device support.
-
-0.3.3 (adt 0.3.3, ddms 0.2.3, editors 0.1.0)
-
-- Support for referenced projects.
-- During launch, display if a package conflict occurs when the new
-  application is pushed onto the device.
-- You can now change the font of the logcat view. Also indentation is
-  now properly displayed.
-- Plugin generated files are now properly marked as derived. This will
-  make Team plugins ignore them.
-
-0.3.2
-
-- XML Highlighting for AndroidManifest.xml (requires WebTools WST plugin)
-- Custom java editor for R.java/Manifest.java to make those files non
-  editable. This is to replace the current locking mechanism which
-  causes issues on Mac OS.
-- Fixed some issue in the "Restart adb" feature in the device view of
-  ddms.
-- Better handling of aidl files and the java files generated from
-  them.
-- Plugin now retries to launch the app on the emulator if it fails due
-  to timing issues.
-- Skin dropdown in the Emulator/Target tabs is now build from the
-  content of the skin directory, to support developer made skins.
-- Emulator control panel. This is a UI on top of the emulator
-  console. it allows you to change the state of the network and gsm
-  connection, and to initiate incoming voice call.
-
-0.3.1
-
-- Fixed issue on winXP/Eclipse 3.2 where errors in the New Project
-  Wizard would not display.
-- Added missing intent definition in the AndroidManifest.xml file
-  created by the New Project Wizard.
-- Fixed possible NPE in the debug action from the Process View
-- Support for Eclipse 3.4
-
-0.2.6 / 0.3.0
-
-- New Project Wizard now makes it easy to open Android sample code
-- Plugin will output a warning if the build id of the device/emulator
-  does not match the sdk build id.
-- Java/Debug/ddms perspective now contains direct menus to open some
-  of the ddms views, and to create a new android project. This will
-  require you to reset your perspectives.
-- Error during builds now put an error marker on the project instead
-  of displaying an (annoying) dialog box.
-- Custom builders now remember their build state when restarting
-  eclipse.
-- Properly parse some aapt warnings and don't abort the build when
-  they happen.
-- Abort launch and prompt the user if the project contains errors.
-- New silent/normal/verbose build output.
-
-0.2.5
-
-- Check compiler compliance level before compilation and abort if
-  different from 1.5
-- Fix Project Properties will fix the project compiler compliance if
-  needed.
-- Fixed an issue with multiple source folders.
-- Added support for new Manifest.java class (it is automatically
-  generated with R.java if the content of the AndroidManifest.xml
-  requires it)
-- Fixed an issue that could result in not packaging code changes.
-- Automatic fix of the Launch Configurations when the java package in
-  the manifest is changed. Also improved Launch Config dialog and
-  error alert for erroneous activity names in the Launch
-  Configuration.
-- Support for external jars that are not under the project root
-  directory.
-- New projects have a default layout.
-- Misc fixes for Windows support.
-
-0.2.4
-
-- Fixed large resource corruption issue.
-
-0.2.3
-
-- Fixed issue related to the integration of dx.
-- Fixed issue related to the package generation that was modified for
-  windows support.
-
-0.2.2
-
-- Changing the SDK location in the Preferences does not require to
-  restart Eclipse anymore.
-- New SDK-Project sync mode in Android preference pane. Default value
-  set to true. If true, all android projects are automatically sync'ed
-  to the SDK defined in the preferences.
-- Cases where no emulator is running but a dialog still says "An
-  emulator is running..." should be less frequent.
-- Projects do not reference the standard desktop JRE anymore, as
-  android.zip contains the core java library. This will solve the case
-  where using a core class non present on the platform would not
-  generate a compilation error.
-- Changing the package defined in the manifest now deletes the R.java
-  class from its previous location. This will require 1 build after
-  upgrading the plugin, before it works.
-- Project selection in the Launch Config Dialog now only shows Android
-  projects.
-- Launching a debug/run session now checks that the project uses the
-  SDK set in the preferences (This is for the non automatic sync
-  mode).
-- Removed obsolete wallpaper mode in the New Project Creation Wizard.
-- dx (dalvik code conversion tool) now embedded instead of calling the
-  external version.
-- Improvements in the parsing of the aapt errors.
-- Some fixes for windows support.
-
-
-0.2.1
-
-- Fixed bug in logcat search where invalid regexp would cause a crash
-- Minor improvements to the build/launch process.
-
-0.2.0
-
-- Logcat view.
-- File Explorer view.
-- Custom options for emulator. In the Launch configuration dialog you
-  can specify custom command line emulator options. See
-  "emulator -help" for available options.
-- Android Tools > Export Application Package is now implemented.
-- Misc incremental builder fixes.
-- Including static .jar files as library in your project will
-  automatically include them in the final APK. Warning: only the
-  .class content is included.
-
-0.1.10
-
-- The res and assets folders now fully refresh before the build,
-  ensuring R.java and packaged resources are always up to date. This
-  can be disabled in the preferences under "Android" if this becomes
-  slow due to too many files.
-
-0.1.9
-
-- New Action in the "Processes" view to debug an application that is
-  already running. The source project for this application MUST be
-  opened in the current workspace.
-- Building the project now force refreshes the res folder. This should
-  help rebuilding the resources when only binary files were changed
-  from outside eclipse.
-- Clean/full builds now compile all aidl files found in the build path
-  (previously only incremental builds would compile them). Also, misc
-  improvements to the incremental builders.
-- Starting a run/debug session now asks to save the files and forces a
-  new build to ensure that the latest package is pushed on the device.
-- Plugin should be less aggressive when waiting for the emulator to be
-  ready. This should translate in fewer failed launches.
-
-0.1.8
-
-- Fixed Debugger issue introduced in 0.1.6
-- Added Log level preferences for DDMS. Look under Android > DDMS >
-  Advanced. Default error level is Error.
-
-0.1.7
-
-- Fixed issue where java warnings wouldn't trigger a new package. Now
-  only errors stop the packaging like it should be.
-- Added more error output in the console during launch.
-
-0.1.6
-
-- New "Android" Console. It receives the error output from external
-  tools such and aidl, dx, and aapt (only when they can't be
-  parsed). Any error force the console to be displayed.
-- The Activity Manager on the device/emulator now outputs some
-  messages in the "Android" console when asked to start an
-  activity. This should help you figure out what is wrong if the
-  application doesn't start.
-- Fixed a case where the .apk file would be updated with broken
-  code. Now if there are java compile error, the .apk is not touched.
-- Added support for manifest with non fully qualified activity java
-  name, yet not starting with a dot.
-- Fixed creation of manifest files (through New Project wizard) to use
-  proper namespace for attributes.
-- Better error reporting for namespace issue in the manifest.
-- "Reset Adb" action from the device view. Use this is the plugin
-  tells you an emulator is running when there are none.
-- New "ddms" Console which receives the standard output of ddms.
-
-0.1.5
-
-- Support for new activity declaration inside AndroidManifest.xml
-- fixed issue that prevented bin/ to be removed from the buildpath
-  when converting project.
-
-0.1.4
-
-- Changes in the Manifest, now properly trigger a new package of the
-  resources.
-
-0.1.3
-
-- Fixed the "fix project properties" action to remove old framework
-  libraries, just not add new ones.
-
-0.1.2
-
-- aidl builder. The Android Resources PreBuilder now also converts
-  aidl files into java files.
-- New Project wizard now allows to make Wallpaper activities instead
-  of gadgets (which are obsolete.)
-- Launch shortcuts. Right click in the package explorer allow you to
-  launch the application in debug or run mode directly without
-  creating launch configurations.
-- New project wizard and Project conversion now sets up the java doc
-  path for android.zip
-- Package builder now supports custom application assets placed in
-  assets/ (which is now created automatically by the New Project
-  Wizard).
-- New action: Android Tools > Fix Project Properties, in the package
-  explorer contextual menu. This allows you to fix the framework path
-  (and its javadoc path) in case you change the sdk location.
-
-0.1.1
-
-- Fixed project convertor to add the framework library if missing.
-
-0.1.0
-
-- New project wizard.
-- Python script-generated project convertor.
-- Incremental builders.
-- XML validation for resource files.
-- Android Launch Configuration.
diff --git a/eclipse/dictionary.txt b/eclipse/dictionary.txt
deleted file mode 100644
index 0dc00fd..0000000
--- a/eclipse/dictionary.txt
+++ /dev/null
@@ -1,362 +0,0 @@
-&apos;
-aapt
-accessor
-accessors
-adb
-addon
-adt
-aidl
-alt
-android
-anim
-antialias
-antialiased
-apache
-api
-apk
-app
-apps
-arg
-async
-attr
-attrs
-avd
-avds
-backfill
-backport
-backported
-basename
-basenames
-bitmask
-breadcrumb
-builtin
-bytecode
-cairo
-callback
-callbacks
-carlo
-cf
-changeset
-charset
-checkbox
-checkboxes
-classloader
-classpath
-clickable
-clipart
-clipboard
-clipboards
-closeables
-clueless
-codebase
-codename
-codenames
-colspan
-combo
-combobox
-combos
-compositor
-config
-configs
-configurability
-congrats
-coords
-credentials
-cyclical
-dalvik
-ddms
-deactivated
-debuggable
-dedent
-defstyle
-deprecated
-deselect
-deselects
-designtime
-dev
-dex
-dexified
-diff
-diffs
-dir
-dirs
-discoverable
-displayable
-ditto
-div
-docs
-dp
-dpi
-drawable
-drawables
-dropdown
-ed
-editable
-em
-endian
-endpoint
-enum
-enums
-env
-equidistant
-exec
-fallback
-flux
-flyout
-foo
-foreach
-fqcn
-framelayout
-froyo
-gen
-gif
-git
-glob
-globbing
-groovy
-guava
-guillemets
-hardcode
-hardcoded
-hardcodes
-hdpi
-helvetica
-highlighter
-holo
-hotfix
-href
-html
-http
-hyperlink
-hyperlinks
-ids
-ie
-iff
-img
-infos
-init
-inits
-inline
-inlined
-inset
-instanceof
-instantiatable
-int
-inter
-interpolator
-interpolators
-iterable
-javac
-javadoc
-jpg
-keystore
-layoutlib
-ldpi
-leaky
-levenshtein
-lib
-lifecycle
-linebreaks
-linestyle
-linkable
-linux
-locale
-locales
-logo
-lombok
-lopsided
-lowercase
-luminance
-mac
-macs
-malformed
-markup
-marquee
-maven
-mdpi
-memento
-metadata
-micro
-min
-mipmap
-misaligned
-monospace
-monte
-ms
-msg
-multi
-multimap
-multimaps
-namespace
-namespaces
-newfound
-nexus
-ninepatch
-nodpi
-nulling
-num
-ok
-op
-os
-palette
-param
-params
-parented
-pings
-placeholder
-placeholders
-plugin
-plugins
-png
-popup
-popups
-pre
-precompiler
-precompute
-precomputing
-pref
-prefs
-preload
-preloaded
-preloads
-primordial
-printf
-pristine
-programmatic
-programmatically
-proguard
-propertysheet
-proxies
-proxy
-pulldown
-px
-quickfix
-recompilation
-rect
-redo
-refactor
-refactored
-refactoring
-refactorings
-regex
-regexp
-regexps
-registry
-reindent
-reindenting
-remap
-renderable
-reparse
-reparses
-rescales
-residual
-resilient
-resizability
-resizable
-rev
-risky
-rollback
-rowspan
-rowspans
-sandbox
-sans
-scrollable
-scrollbar
-scrollbars
-scrubbing
-sdcard
-sdk
-se
-searchable
-selectable
-semi
-serializer
-settable
-snip
-spec
-src
-standalone
-stash
-stat
-stateful
-stateless
-stderr
-stdout
-stretchable
-stretchiness
-struct
-styleable
-styleables
-stylesheet
-subclassed
-subclassing
-submenu
-submenus
-subregion
-superclasses
-supertype
-symlinks
-synced
-syncs
-synthetically
-tabbed
-tad
-temp
-templated
-textfield
-textfields
-thematically
-themed
-thumbnail
-thumbnails
-timestamp
-timestamps
-tmp
-toolbar
-toolbars
-tooltip
-tooltips
-traceview
-translucency
-trig
-txt
-typo
-ui
-uncomment
-undescribed
-undoable
-unfiltered
-unhide
-unicode
-uninstall
-uninstallation
-uninstalling
-unset
-unweighted
-upcoming
-uppercase
-uri
-url
-urls
-utf
-validator
-validators
-varargs
-verbosity
-viewport
-vs
-wakelock
-wakelocks
-wallpaper
-webtools
-whilst
-wildcard
-workflow
-xdpi
-xhdpi
-xlarge
-xml
-xmlns
-ydpi
-zip
-zipalign
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/.project b/eclipse/features/com.android.ide.eclipse.adt.package/.project
deleted file mode 100644
index 1024cf0..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt.package/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-adt-package</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/build.properties b/eclipse/features/com.android.ide.eclipse.adt.package/build.properties
deleted file mode 100644
index 64dc64a..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt.package/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
-               p2.inf
-includeLaunchers=false
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
deleted file mode 100644
index 56eeaaf..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.adt.package.feature"
-      label="ADT Package"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project"
-      plugin="com.android.ide.eclipse.adt.package">
-
-   <description url="http://developer.android.com">
-      Android Developer Tools
-   </description>
-
-   <copyright>
-      Copyright (C) 2007-2014 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
-      Note:  kxml2-2.3.0.jar is under the BSD license rather ...
-   </license>
-
-   <requires>
-      <import plugin="com.android.ide.eclipse.adt" version="22.3.0" match="greaterOrEqual"/>
-      <import plugin="com.android.ide.eclipse.base" version="22.3.0" match="greaterOrEqual"/>
-      <import plugin="com.android.ide.eclipse.ddms" version="22.3.0" match="greaterOrEqual"/>
-      <import plugin="com.android.ide.eclipse.gldebugger" version="22.3.0" match="greaterOrEqual"/>
-      <import plugin="com.android.ide.eclipse.hierarchyviewer" version="22.3.0" match="greaterOrEqual"/>
-      <import plugin="com.android.ide.eclipse.traceview" version="22.3.0" match="greaterOrEqual"/>
-      <import plugin="com.android.ide.eclipse.ndk" version="22.3.0" match="greaterOrEqual"/>
-      <import plugin="overlay.com.android.ide.eclipse.adt.overlay"/>
-      <import feature="org.eclipse.equinox.p2.user.ui"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.rcp"/>
-      <import feature="org.eclipse.egit"/>
-      <import feature="org.eclipse.egit.import"/>
-      <import feature="org.eclipse.cdt"/>
-      <import feature="org.eclipse.jdt"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.adt.package"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/p2.inf b/eclipse/features/com.android.ide.eclipse.adt.package/p2.inf
deleted file mode 100644
index 93a365c..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt.package/p2.inf
+++ /dev/null
@@ -1,9 +0,0 @@
-#tell pde.build not to generate start levels
-org.eclipse.pde.build.append.startlevels=false
-
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=org.eclipse.platform.ide
-requires.1.greedy=true
-
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//dl.google.com/android/eclipse/,type:0,name:Android Developer Tools Update Site,enabled:true);
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml
deleted file mode 100644
index 2ed5049..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.adt.package.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>adt.package</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/features/com.android.ide.eclipse.adt/.project b/eclipse/features/com.android.ide.eclipse.adt/.project
deleted file mode 100644
index 513b14b..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-adt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.adt/build.properties b/eclipse/features/com.android.ide.eclipse.adt/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
deleted file mode 100644
index 61bfbb0..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.adt.feature"
-      label="Android Development Tools"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project"
-      plugin="com.android.ide.eclipse.adt">
-
-   <description>
-      Android Developer Tools.
-   </description>
-
-   <copyright>
-      Copyright (C) 2007-2011 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
-      Note:  kxml2-2.3.0.jar is under the BSD license rather than the EPL.  You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
-
-      Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-&quot;Contribution&quot; means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-&quot;Contributor&quot; means any person or entity that distributes the Program.
-
-&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
-
-&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-   </license>
-
-   <url>
-      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
-   </url>
-
-   <requires>
-      <import plugin="com.android.ide.eclipse.base" match="perfect"/>
-      <import plugin="com.android.ide.eclipse.ddms" match="perfect"/>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt"/>
-      <import plugin="org.eclipse.ant.core"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ui" version="3.7" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.browser"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.wst.xml.ui"/>
-      <import plugin="org.eclipse.jdt.junit"/>
-      <import plugin="org.eclipse.jdt.junit.runtime"/>
-      <import plugin="org.eclipse.ltk.core.refactoring"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.compare"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.adt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="overlay.com.android.ide.eclipse.adt.overlay"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.adt/pom.xml b/eclipse/features/com.android.ide.eclipse.adt/pom.xml
deleted file mode 100644
index 30e504d..0000000
--- a/eclipse/features/com.android.ide.eclipse.adt/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.adt.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>adt</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/.project b/eclipse/features/com.android.ide.eclipse.ddms/.project
deleted file mode 100644
index 3a74819..0000000
--- a/eclipse/features/com.android.ide.eclipse.ddms/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-ddms</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/build.properties b/eclipse/features/com.android.ide.eclipse.ddms/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.ddms/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
deleted file mode 100644
index 812a9f2..0000000
--- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.ddms.feature"
-      label="Android DDMS"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project"
-      plugin="com.android.ide.eclipse.ddms">
-
-   <description>
-      Android Dalvik Debug Monitor Service
-   </description>
-
-   <copyright>
-      Copyright (C) 2007-2011 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0">
-      Note:  jcommon-1.0.12.jar is under the BSD license rather than the APL.  You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
-
-   jfreechart-1.0.9.jar and jfreechart-1.0.9-swt.jar are under the LGPL rather than the APL.  You can find a copy of the LGPL at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt.  You can get the source code for these two components at http://android.git.kernel.org/pub/jfreechart-1.0.9.zip
-
-
-      Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&apos;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   </license>
-
-   <url>
-      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.android.ide.eclipse.ddms"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml
deleted file mode 100644
index fc9680d..0000000
--- a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.ddms.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>ddms</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/.project b/eclipse/features/com.android.ide.eclipse.gldebugger/.project
deleted file mode 100644
index 067a8f4..0000000
--- a/eclipse/features/com.android.ide.eclipse.gldebugger/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-gldebugger</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/build.properties b/eclipse/features/com.android.ide.eclipse.gldebugger/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.gldebugger/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
deleted file mode 100644
index 2259187..0000000
--- a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.gldebugger.feature"
-      label="Tracer for OpenGL ES"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project">
-
-   <description>
-      GLESv2 Debugger Client (Alpha status).
-   </description>
-
-   <copyright>
-      Copyright (C) 2011 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0">
-      Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&apos;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.gldebugger"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml
deleted file mode 100644
index 65f086f..0000000
--- a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.gldebugger.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>gldebugger</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/.project b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/.project
deleted file mode 100644
index 0c7a096..0000000
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-hierarchyviewer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/build.properties b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
deleted file mode 100644
index b9b3596..0000000
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.hierarchyviewer.feature"
-      label="Android Hierarchy Viewer"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project"
-      plugin="com.android.ide.eclipse.hierarchyviewer">
-
-   <description>
-      Android Hierarchy Viewer.
-   </description>
-
-   <copyright>
-      Copyright (C) 2010-2011 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0.txt">
-      Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&apos;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   </license>
-
-   <url>
-      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="com.android.ide.eclipse.ddms" match="perfect"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.hierarchyviewer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml
deleted file mode 100644
index 119476a..0000000
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.hierarchyviewer.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>hierarchyviewer</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/features/com.android.ide.eclipse.monitor/.project b/eclipse/features/com.android.ide.eclipse.monitor/.project
deleted file mode 100644
index 347f1dc..0000000
--- a/eclipse/features/com.android.ide.eclipse.monitor/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-monitor</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.monitor/build.properties b/eclipse/features/com.android.ide.eclipse.monitor/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.monitor/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml
deleted file mode 100644
index 5720908..0000000
--- a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.monitor.feature"
-      label="Android Monitor"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project"
-      plugin="com.android.ide.eclipse.monitor">
-
-   <description>
-      Android Debug Monitor
-   </description>
-
-   <copyright>
-      Copyright (C) 2007-2014 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0">
-      Note:  jcommon-1.0.12.jar is under the BSD license rather than the APL.  You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
-
-   jfreechart-1.0.9.jar and jfreechart-1.0.9-swt.jar are under the LGPL rather than the APL.  You can find a copy of the LGPL at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt.  You can get the source code for these two components at http://android.git.kernel.org/pub/jfreechart-1.0.9.zip
-
-
-      Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&apos;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   </license>
-
-   <plugin
-         id="com.android.ide.eclipse.monitor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml
deleted file mode 100644
index a59a05f..0000000
--- a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.monitor.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>monitor</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/features/com.android.ide.eclipse.ndk/.project b/eclipse/features/com.android.ide.eclipse.ndk/.project
deleted file mode 100644
index 42d1891..0000000
--- a/eclipse/features/com.android.ide.eclipse.ndk/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-ndk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.ndk/build.properties b/eclipse/features/com.android.ide.eclipse.ndk/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.ndk/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml
deleted file mode 100644
index 8a8407e..0000000
--- a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.ndk.feature"
-      label="Android Native Development Tools"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project">
-
-   <description>
-      Android Native Developer Tools.
-   </description>
-
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
-      Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-&quot;Contribution&quot; means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-&quot;Contributor&quot; means any person or entity that distributes the Program.
-
-&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
-
-&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-   </license>
-
-   <url>
-      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.cdt"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.ndk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml
deleted file mode 100644
index 87da6f3..0000000
--- a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.ndk.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>ndk</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/features/com.android.ide.eclipse.pdt/.project b/eclipse/features/com.android.ide.eclipse.pdt/.project
deleted file mode 100644
index 8aa2663..0000000
--- a/eclipse/features/com.android.ide.eclipse.pdt/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-pdt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.pdt/build.properties b/eclipse/features/com.android.ide.eclipse.pdt/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.pdt/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
deleted file mode 100644
index 446509a..0000000
--- a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.pdt"
-      label="Android Platform Development Tools"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project">
-
-   <description>
-      Android Platform Developer Tools.
-   </description>
-
-   <copyright>
-      Copyright (C) 2010-2011 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0.txt">
-      Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-     where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&apos;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   </license>
-
-   <url>
-      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="com.android.ide.eclipse.ddms"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.pdt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.tests/.project b/eclipse/features/com.android.ide.eclipse.tests/.project
deleted file mode 100644
index e9a6867..0000000
--- a/eclipse/features/com.android.ide.eclipse.tests/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.tests/build.properties b/eclipse/features/com.android.ide.eclipse.tests/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.tests/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.tests/feature.xml b/eclipse/features/com.android.ide.eclipse.tests/feature.xml
deleted file mode 100644
index 965e3ec..0000000
--- a/eclipse/features/com.android.ide.eclipse.tests/feature.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.tests"
-      label="ADT Tests"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project">
-
-   <copyright>
-      Copyright (C) 2007-2011 The Android Open Source Project
-   </copyright>
-
-   <requires>
-      <import plugin="org.junit"/>
-      <import plugin="com.android.ide.eclipse.adt" version="10.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/.project b/eclipse/features/com.android.ide.eclipse.traceview/.project
deleted file mode 100644
index c6cf73c..0000000
--- a/eclipse/features/com.android.ide.eclipse.traceview/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>feature-traceview</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/build.properties b/eclipse/features/com.android.ide.eclipse.traceview/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/eclipse/features/com.android.ide.eclipse.traceview/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
deleted file mode 100644
index 43793a6..0000000
--- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.android.ide.eclipse.traceview.feature"
-      label="Android Traceview"
-      version="24.3.3.qualifier"
-      provider-name="The Android Open Source Project"
-      plugin="com.android.ide.eclipse.traceview">
-
-   <description>
-      Android Traceview
-   </description>
-
-   <copyright>
-      Copyright (C) 2011 The Android Open Source Project
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0">
-      Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&apos;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   </license>
-
-   <url>
-      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="com.android.ide.eclipse.ddms" version="10.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.core.resources"/>
-   </requires>
-
-   <plugin
-         id="com.android.ide.eclipse.traceview"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml
deleted file mode 100644
index eea0f7f..0000000
--- a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.traceview.feature</artifactId>
-    <packaging>eclipse-feature</packaging>
-    <name>traceview</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/monitor/build.gradle b/eclipse/monitor/build.gradle
deleted file mode 100644
index da8adcf..0000000
--- a/eclipse/monitor/build.gradle
+++ /dev/null
@@ -1,111 +0,0 @@
-apply plugin: 'sdk-files'
-
-def basePath = "../../../out/host/maven/bundles-24.3.3-SNAPSHOT/products/"
-
-sdk {
-    linux {
-        item('monitor') {
-            notice null
-            executable true
-        }
-        item(basePath + 'lin64/monitor') {
-            into 'lib/monitor-x86_64'
-            notice null
-            builtBy 'unzipLinux64'
-        }
-        item(basePath + 'lin/monitor') {
-            into 'lib/monitor-x86'
-            notice null
-            builtBy 'unzipLinux'
-        }
-    }
-
-    mac {
-        item('monitor') {
-            notice null
-            executable true
-        }
-        item(basePath + 'mac64/monitor') {
-            into 'lib/monitor-x86_64'
-            notice null
-            builtBy 'unzipMac64'
-        }
-    }
-
-
-    windows {
-        item('monitor.bat') {
-            notice null
-            executable true
-        }
-        item(basePath + 'win64/monitor') {
-            into 'lib/monitor-x86_64'
-            notice null
-            builtBy 'unzipWin64'
-        }
-        item(basePath + 'win/monitor') {
-            into 'lib/monitor-x86'
-            notice null
-            builtBy 'unzipWin'
-        }
-    }
-}
-
-// Using PDE build, the size of monitor was 43M
-// With Tycho, we are at close to 75M. Until we figure out the proper way
-// to exclude unnecessary content, we just remove these plugins from the final build.
-def pluginsToRemove = [
-    'org.eclipse.platform.doc.user_4.2.2.v20130121-200410.jar',
-    'org.eclipse.debug.ui_3.8.2.v20130130-171415.ja',
-    'org.apache.jasper.glassfish_2.2.2.v201205150955.jar',
-    'org.eclipse.team.ui_3.6.201.v20130125-135424.jar',
-    'org.apache.lucene.core_2.9.1.v201101211721.jar',
-    'org.eclipse.help.webapp_3.6.101.v20130116-182509.jar',
-    'org.eclipse.help.ui_3.5.201.v20130108-092756.jar',
-    'org.eclipse.help.base_3.6.101.v201302041200.jar',
-    'org.eclipse.team.core_3.6.100.v20120524-0627.jar',
-    'org.eclipse.jetty.server_8.1.3.v20120522.jar',
-    'org.eclipse.ui.intro_3.4.200.v20120521-2344.jar',
-    'org.eclipse.ui.cheatsheets_3.4.200.v20120521-2344.jar',
-    'org.apache.ant_1.8.3.v201301120609/**'
-]
-
-task unzipLinux64(type: Copy) {
-    from zipTree(file(basePath + 'monitorproduct-linux.gtk.x86_64.zip'))
-    into file(basePath + 'lin64/')
-    pluginsToRemove.each {
-        exclude "**/$it"
-    }
-}
-
-task unzipLinux(type: Copy) {
-    from zipTree(file(basePath + 'monitorproduct-linux.gtk.x86.zip'))
-    into file(basePath + 'lin/')
-    pluginsToRemove.each {
-        exclude "**/$it"
-    }
-}
-
-task unzipMac64(type: Copy) {
-    from zipTree(file(basePath + 'monitorproduct-macosx.cocoa.x86_64.zip'))
-    into file(basePath + 'mac64/')
-    pluginsToRemove.each {
-        exclude "**/$it"
-    }
-}
-
-task unzipWin64(type: Copy) {
-    from zipTree(file(basePath + 'monitorproduct-win32.win32.x86_64.zip'))
-    into file(basePath + 'win64/')
-    pluginsToRemove.each {
-        exclude "**/$it"
-    }
-}
-
-task unzipWin(type: Copy) {
-    from zipTree(file(basePath + 'monitorproduct-win32.win32.x86.zip'))
-    into file(basePath + 'win/')
-    pluginsToRemove.each {
-        exclude "**/$it"
-    }
-}
diff --git a/eclipse/monitor/monitor b/eclipse/monitor/monitor
deleted file mode 100755
index 53a2bb5..0000000
--- a/eclipse/monitor/monitor
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-# Copyright 2012, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set up prog to be the path of this script, including following symlinks,
-# and set up progdir to be the fully-qualified pathname of its directory.
-prog="$0"
-while [ -h "${prog}" ]; do
-    newProg=`/bin/ls -ld "${prog}"`
-    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
-    if expr "x${newProg}" : 'x/' >/dev/null; then
-        prog="${newProg}"
-    else
-        progdir=`dirname "${prog}"`
-        prog="${progdir}/${newProg}"
-    fi
-done
-oldwd=`pwd`
-progdir=`dirname "${prog}"`
-cd "${progdir}"
-
-javaCmd="java"
-
-vmarch=`${javaCmd} -jar lib/archquery.jar`
-
-app=lib/monitor-${vmarch}/monitor
-if [[ "Darwin" == `uname` ]]; then
-  app=${app}.app/Contents/MacOS/monitor
-fi
-
-
-exec $app
-
diff --git a/eclipse/monitor/monitor.bat b/eclipse/monitor/monitor.bat
deleted file mode 100755
index aab18ae..0000000
--- a/eclipse/monitor/monitor.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-@echo off

-rem Copyright (C) 2012 The Android Open Source Project

-rem

-rem Licensed under the Apache License, Version 2.0 (the "License");

-rem you may not use this file except in compliance with the License.

-rem You may obtain a copy of the License at

-rem

-rem      http://www.apache.org/licenses/LICENSE-2.0

-rem

-rem Unless required by applicable law or agreed to in writing, software

-rem distributed under the License is distributed on an "AS IS" BASIS,

-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-rem See the License for the specific language governing permissions and

-rem limitations under the License.

-

-rem don't modify the caller's environment

-setlocal

-

-rem Change current directory and drive to where the script is, to avoid

-rem issues with directories containing whitespaces.

-cd /d %~dp0

-

-rem Check we have a valid Java.exe in the path.

-set java_exe=

-call lib\find_java.bat

-if not defined java_exe goto :EOF

-

-:QueryArch

-for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set vmarch=%%a

-

-start lib\monitor-%vmarch%\monitor

-

diff --git a/eclipse/plugins/.gitignore b/eclipse/plugins/.gitignore
deleted file mode 100644
index 76afe3e..0000000
--- a/eclipse/plugins/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*/bin
-
-com.android.ide.eclipse.tests/unittests/com/android/ddmlib
-com.android.ide.eclipse.tests/unittests/com/android/sdklib
-com.android.ide.eclipse.tests/unittests/com/android/sdkuilib
-com.android.ide.eclipse.tests/unittests/com/android/layoutlib
-
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.classpath
deleted file mode 100644
index acad1c2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.project b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.project
deleted file mode 100644
index b24d832..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>plugin-adt-overlay</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ea66196..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=com.android.annotations.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=com.android.annotations.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
-org.eclipse.jdt.core.compiler.annotation.nullable=com.android.annotations.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
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
deleted file mode 100644
index d1f897e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-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.3.3.qualifier
-Bundle-Vendor: The Android Open Source Project
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- com.android.ide.eclipse.adt
-Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.jface.text.formatter
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/MODULE_LICENSE_EPL b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/MODULE_LICENSE_EPL
deleted file mode 100644
index e69de29..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/MODULE_LICENSE_EPL
+++ /dev/null
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/NOTICE b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/NOTICE
deleted file mode 100644
index cedb5b4..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/NOTICE
+++ /dev/null
@@ -1,221 +0,0 @@
-*Eclipse Public License - v 1.0*
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-*1. DEFINITIONS*
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the Program
-under their own license agreement, and (ii) are not derivative works of
-the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-*2. GRANT OF RIGHTS*
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent license
-under Licensed Patents to make, use, sell, offer to sell, import and
-otherwise transfer the Contribution of such Contributor, if any, in
-source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the
-Contribution is added by the Contributor, such addition of the
-Contribution causes such combination to be covered by the Licensed
-Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-*3. REQUIREMENTS*
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or conditions
-of title and non-infringement, and implied warranties or conditions of
-merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-*4. COMMERCIAL DISTRIBUTION*
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-*5. NO WARRANTY*
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
-ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
-OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
-A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program
-and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program
-errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-*6. DISCLAIMER OF LIABILITY*
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-*7. GENERAL*
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to distribute the Program (including
-its Contributions) under the new version. Except as expressly stated in
-Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
-to the intellectual property of any Contributor under this Agreement,
-whether expressly, by implication, estoppel or otherwise. All rights in
-the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to
-this Agreement will bring a legal action under this Agreement more than
-one year after the cause of action arose. Each party waives its rights
-to a jury trial in any resulting litigation.
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/README.txt b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/README.txt
deleted file mode 100644
index 7b7f0d1..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/README.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-This plugin provides a minor extension to the ADT plugin to support
-XML formatting via the "Source > Format" action on files.
-
-The reason the plugin package name starts with the word "overlay"
-instead of the normal "com.android.eclipse" package is that the plugin
-name *must* be alphabetically later than "org.eclipse". The reasons
-for this is detailed in issue
-   http://code.google.com/p/android/issues/detail?id=20450
-but essentially the plugin registration to override the
-formatProcessor is processed in the alphabetical order of the plugin
-names, so the org.eclipse plugin would clobber the com.android.eclipse
-plugin. To work around this, the specific registration code was moved
-out to a separate plugin, but the formatter itself continues to live
-in ADT.
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.properties
deleted file mode 100644
index 50668f3..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = META-INF/,\
-               plugin.xml,\
-               NOTICE
-jars.compile.order =
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/plugin.xml
deleted file mode 100644
index 5b4b520..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/plugin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.5"?>
-<plugin>
-    <extension point="org.eclipse.wst.sse.core.formatProcessors">
-        <processor
-            class="com.android.ide.eclipse.adt.internal.editors.formatting.XmlFormatProcessor"
-            contentTypeId="org.eclipse.core.runtime.xml">
-        </processor>
-    </extension>
-</plugin>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml
deleted file mode 100644
index 6dbe3d2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>overlay.com.android.ide.eclipse.adt.overlay</artifactId>
-    <packaging>eclipse-plugin</packaging>
-    <name>adt.overlay</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/.project b/eclipse/plugins/com.android.ide.eclipse.adt.package/.project
deleted file mode 100644
index eedf4c6..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>plugin-adt-package</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
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
deleted file mode 100644
index 999aead..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ADT Package
-Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true
-Bundle-Version: 24.3.3.qualifier
-Bundle-Vendor: The Android Open Source Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Eclipse-BundleShape: dir
-Require-Bundle: org.eclipse.platform,
- org.eclipse.equinox.app
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/about.ini b/eclipse/plugins/com.android.ide.eclipse.adt.package/about.ini
deleted file mode 100644
index 31e8489..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/about.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-aboutText=%blurb
-featureImage=icons/adt32.png
-windowImage=icons/adt16.png
-aboutImage=adt-about.png
-appName=ADT
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/about.properties b/eclipse/plugins/com.android.ide.eclipse.adt.package/about.properties
deleted file mode 100644
index 4f75169..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/about.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-blurb=Android Developer Tools\n\
-\n\
-Build: {0}\n\
-\n\
-Copyright (c) The Android Open Source Project.\n\
-Visit http://developer.android.com and http://source.android.com
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/adt-about.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/adt-about.png
deleted file mode 100644
index 7235e49..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/adt-about.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties
deleted file mode 100644
index 0688953..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               .,\
-               plugin_customization.ini,\
-               adt-about.png,\
-               splash.bmp,\
-               icons/,\
-               about.ini,\
-               about.properties
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.icns b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.icns
deleted file mode 100644
index b29e329..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.icns
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.ico b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.ico
deleted file mode 100644
index 5ea4275..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.ico
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.png
deleted file mode 100644
index 1f76f87..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png
deleted file mode 100644
index bbd14be..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png
deleted file mode 100644
index 0ef9fdf..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt48.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt48.png
deleted file mode 100644
index ab846e1..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt48.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml
deleted file mode 100644
index 7974659..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         id="adtproduct"
-         name="ADT Bundle"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.eclipse.ui.ide.workbench"
-            name="Eclipse">
-         <property
-            name="preferenceCustomization"
-            value="plugin_customization.ini" />
-         <property
-            name="appName"
-            value="Eclipse" />
-         <property
-            name="aboutImage"
-            value="adt-about.png">
-         </property>
-         <property
-            name="aboutText"
-            value="Android Developer Tools&#x0A;&#x0A;This product includes Eclipse Platform, JDT, CDT, EMF, GEF and WTP, all of which are&#x0A;Copyright (c) Eclipse contributors and others.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;Android Developer Tools are Copyright (c) The Android Open Source Project.&#x0A;Visit http://developer.android.com">
-         </property>
-         <property
-            name="startupProgressRect"
-            value="216,229,170,4" />
-         <property
-            name="startupMessageRect"
-            value="216,240,265,30" />
-         <property
-            name="startupForegroundColor"
-            value="999999" />
-         <property
-            name="windowImages"
-            value="icons/adt16.png,icons/adt32.png,icons/adt48.png">
-         </property>
-         <property
-            name="introBrandingImage"
-            value="product:intro-eclipse.png">
-         </property>
-         <property
-            name="introTitle"
-            value="Welcome to the Eclipse IDE for Android Developers">
-         </property>
-         <property
-            name="introBrandingImageText"
-            value="Eclipse Project">
-         </property>
-         <property
-            name="applicationXMI"
-            value="org.eclipse.platform/LegacyIDE.e4xmi">
-         </property>
-         <property
-            name="cssTheme"
-            value="org.eclipse.e4.ui.css.theme.e4_default">
-         </property>
-         <property
-            name="applicationCSSResources"
-            value="platform:/plugin/org.eclipse.ui.themes/images/">
-         </property>
-      </product>
-   </extension>
-   <extension
-         point="org.eclipse.ui.intro">
-      <introProductBinding
-            introId="org.eclipse.ui.intro.universal"
-            productId="com.android.ide.eclipse.adt.package.product">
-      </introProductBinding>
-   </extension>
-</plugin>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini
deleted file mode 100644
index 5585184..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-org.eclipse.ui/defaultPerspectiveId=org.eclipse.jdt.ui.JavaPerspective
-org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
-org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
-org.eclipse.ui/PERSPECTIVE_BAR_EXTRAS=com.android.ide.eclipse.ddms.Perspective
-org.eclipse.ui/PERSPECTIVE_BAR_SIZE=250
-org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false
-org.eclipse.ui.workbench/SHOW_BUILDID_ON_STARTUP=true
-org.eclipse.ui/SHOW_MEMORY_MONITOR=true
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml
deleted file mode 100644
index f6000ce..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.adt.package</artifactId>
-    <packaging>eclipse-plugin</packaging>
-    <name>adt.package</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/splash.bmp b/eclipse/plugins/com.android.ide.eclipse.adt.package/splash.bmp
deleted file mode 100644
index 0af8058..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/splash.bmp
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
deleted file mode 100644
index c5f5919..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="Makefile|resources/" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="libs/ninepatch.jar" sourcepath="/ninepatch"/>
-	<classpathentry exported="true" kind="lib" path="libs/sdkuilib.jar" sourcepath="/sdkuilib"/>
-	<classpathentry exported="true" kind="lib" path="libs/rule-api.jar" sourcepath="/rule-api"/>
-	<classpathentry exported="true" kind="lib" path="libs/lint-api.jar" sourcepath="/lint-api"/>
-	<classpathentry exported="true" kind="lib" path="libs/lint-checks.jar" sourcepath="/lint-checks"/>
-	<classpathentry exported="true" kind="lib" path="libs/asset-studio.jar" sourcepath="/asset-studio"/>
-	<classpathentry exported="true" kind="lib" path="libs/ant-glob.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.20.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/manifest-merger.jar" sourcepath="/ManifestMerger"/>
-	<classpathentry exported="true" kind="lib" path="libs/lombok-ast-0.2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/propertysheet.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/asm-5.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/asm-analysis-5.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/asm-tree-5.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/swtmenubar.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore b/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.project b/eclipse/plugins/com.android.ide.eclipse.adt/.project
deleted file mode 100644
index 0bc58f9..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>plugin-adt</name>
-	<comment></comment>
-	<projects>
-		<project>SdkLib</project>
-		<project>SdkUiLib</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.eclipse.core.resources.prefs b/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b3c7fde..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1 +0,0 @@
-eclipse.preferences.version=1
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ea66196..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=com.android.annotations.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=com.android.annotations.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
-org.eclipse.jdt.core.compiler.annotation.nullable=com.android.annotations.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs b/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs
deleted file mode 100644
index c5e8a5e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.moreunit.prefixes=
-org.moreunit.unitsourcefolder=plugin-adt\:src\:plugin-tests\:unittests\#plugin-adt\:src\:plugin-tests\:src
-org.moreunit.useprojectsettings=true
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
deleted file mode 100644
index 3115f79..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,140 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Android Development Toolkit
-Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true
-Bundle-Version: 24.3.3.qualifier
-Bundle-ClassPath: .,
- libs/sdkuilib.jar,
- libs/ninepatch.jar,
- libs/freemarker-2.3.20.jar,
- libs/rule-api.jar,
- libs/asset-studio.jar,
- libs/lint-api.jar,
- libs/lint-checks.jar,
- libs/lombok-ast-0.2.3.jar,
- libs/asm-5.0.3.jar,
- libs/asm-tree-5.0.3.jar,
- libs/asm-analysis-5.0.3.jar,
- libs/propertysheet.jar,
- libs/ant-glob.jar,
- libs/swtmenubar.jar,
- libs/manifest-merger.jar
-Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin
-Bundle-Vendor: The Android Open Source Project
-Require-Bundle: com.android.ide.eclipse.base,
- com.android.ide.eclipse.ddms,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.jdt,
- org.eclipse.ant.core,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.launching,
- org.eclipse.jface.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.console,
- org.eclipse.core.filesystem,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.forms,
- org.eclipse.ui.browser,
- org.eclipse.ui.views,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.jdt.junit,
- org.eclipse.jdt.junit.runtime,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.core.expressions,
- org.eclipse.compare
-Bundle-ActivationPolicy: lazy
-Export-Package: com.android.ide.common.layout;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.common.layout.grid;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.common.layout.relative;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.common.resources.platform;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt;x-friends:="com.android.ide.eclipse.tests,com.android.ide.eclipse.adt.package",
- com.android.ide.eclipse.adt.internal;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.actions;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.assetstudio;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.build;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.build.builders;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.animator;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.binaryxml;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.color;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.common;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.descriptors;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.drawable;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.export;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.formatting;x-friends:="overlay.com.android.ide.eclipse.adt.overlay,com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout.configuration;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout.descriptors;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout.gle2;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout.gre;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout.properties;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout.refactoring;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.layout.uimodel;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.manifest;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.manifest.descriptors;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.manifest.model;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.manifest.pages;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.menu;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.menu.descriptors;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.otherxml;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.otherxml.descriptors;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.ui;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.ui.tree;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.uimodel;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.values;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.values.descriptors;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.editors.values.uimodel;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.launch;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.launch.junit;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.launch.junit.runtime;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.lint;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.preferences;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.project;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.properties;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.refactorings.core;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.refactorings.extractstring;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.refactorings.renamepackage;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.resources;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.resources.manager;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.sdk;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.sourcelookup;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.ui;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.utils;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.welcome;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.wizards.actions;x-friends:="com.android.ide.eclipse.tests,com.android.ide.eclipse.adt.package",
- com.android.ide.eclipse.adt.internal.wizards.export;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.wizards.exportgradle;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.wizards.newproject;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.wizards.newxmlfile;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.internal.wizards.templates;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.adt.io;x-friends:="com.android.ide.eclipse.tests",
- com.android.manifmerger;x-friends:="com.android.ide.eclipse.tests",
- com.android.ninepatch;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.internal.repository;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.internal.repository.core;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.internal.repository.icons;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.internal.repository.ui;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.internal.tasks;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.internal.widgets;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.repository;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib.ui;x-friends:="com.android.ide.eclipse.tests",
- com.android.tools.lint.checks;x-friends:="com.android.ide.eclipse.tests",
- com.android.tools.lint.client.api;x-friends:="com.android.ide.eclipse.tests",
- com.android.tools.lint.detector.api;x-friends:="com.android.ide.eclipse.tests",
- freemarker.cache;x-friends:="com.android.ide.eclipse.tests",
- freemarker.template;x-friends:="com.android.ide.eclipse.tests"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.ibm.icu.text,
- org.eclipse.core.variables
-
-
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/MODULE_LICENSE_EPL b/eclipse/plugins/com.android.ide.eclipse.adt/MODULE_LICENSE_EPL
deleted file mode 100644
index e69de29..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/MODULE_LICENSE_EPL
+++ /dev/null
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/NOTICE b/eclipse/plugins/com.android.ide.eclipse.adt/NOTICE
deleted file mode 100644
index 49c101d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/NOTICE
+++ /dev/null
@@ -1,224 +0,0 @@
-*Eclipse Public License - v 1.0*
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-*1. DEFINITIONS*
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the Program
-under their own license agreement, and (ii) are not derivative works of
-the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-*2. GRANT OF RIGHTS*
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent license
-under Licensed Patents to make, use, sell, offer to sell, import and
-otherwise transfer the Contribution of such Contributor, if any, in
-source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the
-Contribution is added by the Contributor, such addition of the
-Contribution causes such combination to be covered by the Licensed
-Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-*3. REQUIREMENTS*
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or conditions
-of title and non-infringement, and implied warranties or conditions of
-merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-*4. COMMERCIAL DISTRIBUTION*
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program, the
-Contributor who includes the Program in a commercial product offering
-should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in
-a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the
-Program in a commercial product offering. The obligations in this
-section do not apply to any claims or Losses relating to any actual or
-alleged intellectual property infringement. In order to qualify, an
-Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial
-Contributor to control, and cooperate with the Commercial Contributor
-in, the defense and any related settlement negotiations. The Indemnified
-Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-*5. NO WARRANTY*
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
-ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
-OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
-A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program
-and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program
-errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-*6. DISCLAIMER OF LIABILITY*
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-*7. GENERAL*
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including
-a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails
-to comply with any of the material terms or conditions of this Agreement
-and does not cure such failure in a reasonable period of time after
-becoming aware of such noncompliance. If all Recipient's rights under
-this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's
-obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and may
-only be modified in the following manner. The Agreement Steward reserves
-the right to publish new versions (including revisions) of this
-Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the
-initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is
-published, Contributor may elect to distribute the Program (including
-its Contributions) under the new version. Except as expressly stated in
-Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
-to the intellectual property of any Contributor under this Agreement,
-whether expressly, by implication, estoppel or otherwise. All rights in
-the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to
-this Agreement will bring a legal action under this Agreement more than
-one year after the cause of action arose. Each party waives its rights
-to a jury trial in any resulting litigation.
-
- 
-
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/about.html b/eclipse/plugins/com.android.ide.eclipse.adt/about.html
deleted file mode 100644
index baa6af1..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/about.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 19, 2010</p>	
-<h3>License</h3>
-
-<pre>
- Note:  kxml2-2.3.0.jar is under the BSD license rather than the EPL.  You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
-
-      Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-&quot;Contribution&quot; means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-&quot;Contributor&quot; means any person or entity that distributes the Program.
-
-&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
-
-&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
-</pre>
-
-</body>
-</html>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/about.ini b/eclipse/plugins/com.android.ide.eclipse.adt/about.ini
deleted file mode 100644
index 2d7cdaa..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/about.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-aboutText=%blurb
-featureImage=icons/android-32.png
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/about.properties b/eclipse/plugins/com.android.ide.eclipse.adt/about.properties
deleted file mode 100755
index 34218e9..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/about.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-blurb=Android Development Toolkit\n\

-\n\

-Version\: {featureVersion}\n\

-\n\

-(c) Copyright 2007-2011 The Android Open Source Project.  All rights reserved.\n\

-Visit http://developer.android.com/sdk/eclipse-adt.html

-

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/adt-platform-juno-sr2.target b/eclipse/plugins/com.android.ide.eclipse.adt/adt-platform-juno-sr2.target
deleted file mode 100644
index b63f382..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/adt-platform-juno-sr2.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-
-<target name="adt-platform-juno-sr2" sequenceNumber="4">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.2.2.M20130204-1200"/>
-<unit id="org.eclipse.gef.feature.group" version="3.9.0.201212170307"/>
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.2.v201211061806-7H7GFeJDxumUrsn5qkiQgOEhsz0p60HAmPyU6VX"/>
-<unit id="org.eclipse.pde.source.feature.group" version="3.8.2.v20130116-091538-7c7wFj0FFt6Zr9bd4AM1JEQMS"/>
-<unit id="org.eclipse.emf.codegen.feature.group" version="2.8.0.v20130125-0826"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.8.2.v20130116-090414-8-8nFu3FNOfwKLRuqgXKIy9z0I83"/>
-<unit id="org.eclipse.emf.ecore.feature.group" version="2.8.3.v20130125-0546"/>
-<unit id="org.eclipse.emf.common.feature.group" version="2.8.0.v20130125-0546"/>
-<unit id="org.eclipse.jdt.source.feature.group" version="3.8.2.v20130116-090414-8-8nFu3FNOfwKLRuqgXKIy9z0I83"/>
-<unit id="org.eclipse.emf.feature.group" version="2.8.3.v20130125-0826"/>
-<unit id="org.eclipse.cdt.feature.group" version="8.1.2.201302132326"/>
-<unit id="org.eclipse.egit.feature.group" version="2.2.0.201212191850-r"/>
-<unit id="org.eclipse.emf.common.ui.feature.group" version="2.7.0.v20130125-0826"/>
-<unit id="org.eclipse.emf.codegen.ui.feature.group" version="2.7.0.v20130125-0826"/>
-<unit id="org.eclipse.wb.core.xml.feature.feature.group" version="1.5.2.r42x201302111919"/>
-<repository location="http://download.eclipse.org/releases/juno"/>
-</location>
-</locations>
-</target>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/adt.launch b/eclipse/plugins/com.android.ide.eclipse.adt/adt.launch
deleted file mode 100644
index 5699837..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/adt.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/adt"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="com.android.ide.eclipse.monitor"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-adt-idea133-ksr2"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#10;-Xms128m&#10;-Xmx1024m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.android.tools.asset-studio@default:default,com.android.tools.build.er-model@default:default,com.android.tools.build.manifest-merger@default:default,com.android.tools.common@default:default,com.android.tools.ddms.ddmlib@default:default,com.android.tools.ddms.ddmuilib@default:default,com.android.tools.dvlib@default:default,com.android.tools.external.ant-glob@default:default,com.android.tools.external.liblzf@default:default,com.android.tools.external.libprotobuf-java-lite@default:default,com.android.tools.external.lombok.ast@default:default,com.android.tools.external.propertysheet@default:default,com.android.tools.hierarchyviewer2lib@default:default,com.android.tools.layoutlib.api@default:default,com.android.tools.lint.api@default:default,com.android.tools.lint.checks@default:default,com.android.tools.ninepatch@default:default,com.android.tools.rule-api@default:default,com.android.tools.sdk-common@default:default,com.android.tools.sdklib@default:default,com.android.tools.sdkstats@default:default,com.android.tools.sdkuilib@default:default,com.android.tools.swtmenubar@default:default,com.android.tools.testutils@default:default,com.android.tools.traceview@default:default,com.android.tools.uiautomatorviewer@default:default,com.google.guava@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,commons-logging@default:default,java_cup.runtime@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.jws@default:default,javax.mail@default:default,javax.persistence@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.wsdl*1.5.1.v201012040544@default:default,javax.wsdl*1.6.2.v201012040545@default:default,javax.xml.bind@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml.ws@default:default,javax.xml@default:default,jfree.chart-swt@default:default,jfree.chart@default:default,jfree.jcommon@default:default,junit@default:default,net.sf.kxml.2@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.apache.ant@default:default,org.apache.axis@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.bcel@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.codec*1.4.0@default:default,org.apache.commons.collections@default:default,org.apache.commons.compress@default:default,org.apache.commons.discovery@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.1.1@default:default,org.apache.httpcomponents.httpclient*4.1.3.v201209201135@default:default,org.apache.httpcomponents.httpcore*4.1.0@default:default,org.apache.httpcomponents.httpcore*4.1.4.v201203221030@default:default,org.apache.httpcomponents.httpmime@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.velocity@default:default,org.apache.wsil4j@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.cdt.autotools.core@default:default,org.eclipse.cdt.autotools.docs@default:default,org.eclipse.cdt.autotools.ui@default:default,org.eclipse.cdt.build.crossgcc@default:default,org.eclipse.cdt.codan.checkers.ui@default:default,org.eclipse.cdt.codan.checkers@default:default,org.eclipse.cdt.codan.core.cxx@default:default,org.eclipse.cdt.codan.core@default:default,org.eclipse.cdt.codan.ui.cxx@default:default,org.eclipse.cdt.codan.ui@default:default,org.eclipse.cdt.core.aix@default:false,org.eclipse.cdt.core.linux.ppc64@default:false,org.eclipse.cdt.core.linux.x86@default:false,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.cdt.core.linux@default:false,org.eclipse.cdt.core.lrparser.xlc@default:default,org.eclipse.cdt.core.lrparser@default:default,org.eclipse.cdt.core.macosx@default:false,org.eclipse.cdt.core.parser.upc@default:default,org.eclipse.cdt.core.solaris@default:false,org.eclipse.cdt.core.win32.x86@default:false,org.eclipse.cdt.core.win32.x86_64@default:false,org.eclipse.cdt.core.win32@default:false,org.eclipse.cdt.core@default:default,org.eclipse.cdt.debug.core@default:default,org.eclipse.cdt.debug.gdbjtag.core@default:default,org.eclipse.cdt.debug.gdbjtag.ui@default:default,org.eclipse.cdt.debug.gdbjtag@default:default,org.eclipse.cdt.debug.mi.core@default:default,org.eclipse.cdt.debug.mi.ui@default:default,org.eclipse.cdt.debug.ui.memory.floatingpoint@default:default,org.eclipse.cdt.debug.ui.memory.memorybrowser@default:default,org.eclipse.cdt.debug.ui.memory.search@default:default,org.eclipse.cdt.debug.ui.memory.traditional@default:default,org.eclipse.cdt.debug.ui.memory.transport@default:default,org.eclipse.cdt.debug.ui@default:default,org.eclipse.cdt.doc.isv@default:default,org.eclipse.cdt.doc.user@default:default,org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui@default:default,org.eclipse.cdt.dsf.gdb.ui@default:default,org.eclipse.cdt.dsf.gdb@default:default,org.eclipse.cdt.dsf.ui@default:default,org.eclipse.cdt.dsf@default:default,org.eclipse.cdt.errorparsers.xlc@default:default,org.eclipse.cdt.examples.dsf.pda.ui@default:default,org.eclipse.cdt.examples.dsf.pda@default:default,org.eclipse.cdt.examples.dsf@default:default,org.eclipse.cdt.gdb.ui@default:default,org.eclipse.cdt.gdb@default:default,org.eclipse.cdt.launch.remote@default:default,org.eclipse.cdt.launch@default:default,org.eclipse.cdt.make.core@default:default,org.eclipse.cdt.make.ui@default:default,org.eclipse.cdt.make.xlc.core@default:default,org.eclipse.cdt.managedbuilder.bupc.ui@default:default,org.eclipse.cdt.managedbuilder.core@default:default,org.eclipse.cdt.managedbuilder.gnu.ui@default:default,org.eclipse.cdt.managedbuilder.llvm.ui@default:default,org.eclipse.cdt.managedbuilder.ui@default:default,org.eclipse.cdt.managedbuilder.xlc.core@default:default,org.eclipse.cdt.managedbuilder.xlc.ui@default:default,org.eclipse.cdt.managedbuilder.xlupc.ui@default:default,org.eclipse.cdt.msw.build@default:default,org.eclipse.cdt.qt.core@default:default,org.eclipse.cdt.qt.ui@default:default,org.eclipse.cdt.sdk@default:default,org.eclipse.cdt.testsrunner.boost@default:default,org.eclipse.cdt.testsrunner.gtest@default:default,org.eclipse.cdt.testsrunner.qttest@default:default,org.eclipse.cdt.testsrunner@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.cdt.util@default:default,org.eclipse.cdt.visualizer.core@default:default,org.eclipse.cdt.visualizer.ui@default:default,org.eclipse.cdt@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.activities@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.examples.databinding.project.core.model@default:default,org.eclipse.emf.examples.databinding.project.core@default:default,org.eclipse.emf.examples.databinding.project.ui.rcp@default:default,org.eclipse.emf.examples.generator.validator@default:default,org.eclipse.emf.examples.jet.article2@default:default,org.eclipse.emf.examples.library.edit@default:default,org.eclipse.emf.examples.library.editor@default:default,org.eclipse.emf.examples.library@default:default,org.eclipse.emf.examples@default:default,org.eclipse.emf.exporter.html@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.java.edit@default:default,org.eclipse.emf.java.editor@default:default,org.eclipse.emf.java@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping.xsd2ecore.editor@default:default,org.eclipse.emf.mapping.xsd2ecore@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.flow@default:default,org.eclipse.gef.examples.logic@default:default,org.eclipse.gef.examples.shapes@default:default,org.eclipse.gef.examples.text@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.jem.beaninfo.vm@default:default,org.eclipse.jem.beaninfo@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.jem.util@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jem@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jpt.common.branding@default:default,org.eclipse.jpt.common.core@default:default,org.eclipse.jpt.common.eclipselink.branding@default:default,org.eclipse.jpt.common.eclipselink.core@default:default,org.eclipse.jpt.common.ui@default:default,org.eclipse.jpt.common.utility@default:default,org.eclipse.jpt.dbws.eclipselink.branding@default:default,org.eclipse.jpt.dbws.eclipselink.core.gen@default:default,org.eclipse.jpt.dbws.eclipselink.ui@default:default,org.eclipse.jpt.doc.isv@default:default,org.eclipse.jpt.doc.user@default:default,org.eclipse.jpt.jaxb.branding@default:default,org.eclipse.jpt.jaxb.core.schemagen@default:default,org.eclipse.jpt.jaxb.core@default:default,org.eclipse.jpt.jaxb.eclipselink.branding@default:default,org.eclipse.jpt.jaxb.eclipselink.core.schemagen@default:default,org.eclipse.jpt.jaxb.eclipselink.core@default:default,org.eclipse.jpt.jaxb.eclipselink.ui@default:default,org.eclipse.jpt.jaxb.ui@default:default,org.eclipse.jpt.jpa.annotate@default:default,org.eclipse.jpt.jpa.branding@default:default,org.eclipse.jpt.jpa.core@default:default,org.eclipse.jpt.jpa.db.ui@default:default,org.eclipse.jpt.jpa.db@default:default,org.eclipse.jpt.jpa.eclipselink.branding@default:default,org.eclipse.jpt.jpa.eclipselink.core.ddlgen@default:default,org.eclipse.jpt.jpa.eclipselink.core@default:default,org.eclipse.jpt.jpa.eclipselink.ui@default:default,org.eclipse.jpt.jpa.gen@default:default,org.eclipse.jpt.jpa.ui@default:default,org.eclipse.jpt.jpadiagrameditor.branding@default:default,org.eclipse.jpt.jpadiagrameditor.doc.user@default:default,org.eclipse.jpt.jpadiagrameditor.ui@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.jsf.branding@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.jst.common.annotations.ui@default:default,org.eclipse.jst.common.fproj.enablement.jdt.sdk@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.jst.ejb.doc.user@default:default,org.eclipse.jst.ejb.ui.infopop@default:default,org.eclipse.jst.ejb.ui@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.jst.j2ee.doc.user@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.jst.j2ee.ejb.annotations.emitter@default:default,org.eclipse.jst.j2ee.ejb.annotations.ui@default:default,org.eclipse.jst.j2ee.ejb.annotations.xdoclet@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.jst.j2ee.infopop@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.jst.j2ee.webservice.ui@default:default,org.eclipse.jst.j2ee.webservice@default:default,org.eclipse.jst.j2ee.xdoclet.runtime@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.jst.jee.ejb@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.jst.jee.web@default:default,org.eclipse.jst.jee@default:default,org.eclipse.jst.jsf.apache.trinidad.tagsupport@default:default,org.eclipse.jst.jsf.common.runtime@default:default,org.eclipse.jst.jsf.common.ui@default:default,org.eclipse.jst.jsf.common@default:default,org.eclipse.jst.jsf.core@default:default,org.eclipse.jst.jsf.doc.dev@default:default,org.eclipse.jst.jsf.doc.user@default:default,org.eclipse.jst.jsf.facelet.core@default:default,org.eclipse.jst.jsf.facelet.ui@default:default,org.eclipse.jst.jsf.facesconfig.ui@default:default,org.eclipse.jst.jsf.facesconfig@default:default,org.eclipse.jst.jsf.standard.tagsupport@default:default,org.eclipse.jst.jsf.ui@default:default,org.eclipse.jst.jsp.core@default:default,org.eclipse.jst.jsp.ui.infopop@default:default,org.eclipse.jst.jsp.ui@default:default,org.eclipse.jst.pagedesigner.jsf.ui@default:default,org.eclipse.jst.pagedesigner.jsp.core@default:default,org.eclipse.jst.pagedesigner@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.jst.server.generic.core@default:default,org.eclipse.jst.server.generic.jboss@default:default,org.eclipse.jst.server.generic.jonas@default:default,org.eclipse.jst.server.generic.ui@default:default,org.eclipse.jst.server.preview.adapter@default:default,org.eclipse.jst.server.tomcat.core@default:default,org.eclipse.jst.server.tomcat.ui@default:default,org.eclipse.jst.server.ui.doc.user@default:default,org.eclipse.jst.server.ui.infopop@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.jst.servlet.ui.infopop@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.jst.standard.schemas@default:default,org.eclipse.jst.ws.annotations.core@default:default,org.eclipse.jst.ws.axis.consumption.core@default:default,org.eclipse.jst.ws.axis.consumption.ui@default:default,org.eclipse.jst.ws.axis.creation.ui@default:default,org.eclipse.jst.ws.axis.infopop@default:default,org.eclipse.jst.ws.axis.ui.doc.user@default:default,org.eclipse.jst.ws.axis2.consumption.core@default:default,org.eclipse.jst.ws.axis2.consumption.ui@default:default,org.eclipse.jst.ws.axis2.core@default:default,org.eclipse.jst.ws.axis2.creation.core@default:default,org.eclipse.jst.ws.axis2.creation.ui@default:default,org.eclipse.jst.ws.axis2.ui.doc.user@default:default,org.eclipse.jst.ws.axis2.ui@default:default,org.eclipse.jst.ws.consumption.infopop@default:default,org.eclipse.jst.ws.consumption.ui.doc.user@default:default,org.eclipse.jst.ws.consumption.ui@default:default,org.eclipse.jst.ws.consumption@default:default,org.eclipse.jst.ws.creation.ejb.ui@default:default,org.eclipse.jst.ws.creation.ui@default:default,org.eclipse.jst.ws.cxf.consumption.core@default:default,org.eclipse.jst.ws.cxf.consumption.ui@default:default,org.eclipse.jst.ws.cxf.core@default:default,org.eclipse.jst.ws.cxf.creation.core@default:default,org.eclipse.jst.ws.cxf.creation.ui@default:default,org.eclipse.jst.ws.cxf.doc.user@default:default,org.eclipse.jst.ws.cxf.ui@default:default,org.eclipse.jst.ws.doc.user@default:default,org.eclipse.jst.ws.infopop@default:default,org.eclipse.jst.ws.jaxb.core@default:default,org.eclipse.jst.ws.jaxrs.core@default:default,org.eclipse.jst.ws.jaxrs.ui@default:default,org.eclipse.jst.ws.jaxws.core@default:default,org.eclipse.jst.ws.jaxws.doc.isv@default:default,org.eclipse.jst.ws.jaxws.doc.user@default:default,org.eclipse.jst.ws.jaxws.dom.doc.isv@default:default,org.eclipse.jst.ws.jaxws.dom.integration@default:default,org.eclipse.jst.ws.jaxws.dom.runtime@default:default,org.eclipse.jst.ws.jaxws.dom.ui@default:default,org.eclipse.jst.ws.jaxws.ui@default:default,org.eclipse.jst.ws.jaxws.utils@default:default,org.eclipse.jst.ws.uddiregistry@default:default,org.eclipse.jst.ws.ui@default:default,org.eclipse.jst.ws@default:default,org.eclipse.linuxtools.cdt.autotools.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.dbws.builder@default:default,org.eclipse.persistence.dbws@default:default,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.moxy@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.servertools.doc.isv@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.command.env.core@default:default,org.eclipse.wst.command.env.doc.user@default:default,org.eclipse.wst.command.env.infopop@default:default,org.eclipse.wst.command.env.ui@default:default,org.eclipse.wst.command.env@default:default,org.eclipse.wst.common.api.doc@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.fproj.sdk@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.project.facet.doc.api@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.wst.dtd.ui.infopop@default:default,org.eclipse.wst.dtd.ui@default:default,org.eclipse.wst.dtdeditor.doc.user@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.debug.core@default:default,org.eclipse.wst.jsdt.debug.crossfire@default:default,org.eclipse.wst.jsdt.debug.rhino.debugger@default:default,org.eclipse.wst.jsdt.debug.rhino.ui@default:default,org.eclipse.wst.jsdt.debug.rhino@default:default,org.eclipse.wst.jsdt.debug.transport@default:default,org.eclipse.wst.jsdt.debug.ui@default:default,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.wst.jsdt.web.support.jsp@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.wst.server.http.core@default:default,org.eclipse.wst.server.http.ui@default:default,org.eclipse.wst.server.preview.adapter@default:default,org.eclipse.wst.server.preview@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.wst.server.ui.infopop@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.wst.validation.doc.isv@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.web.ui.infopop@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.wst.web@default:default,org.eclipse.wst.webtools.doc.user@default:default,org.eclipse.wst.ws.api.doc@default:default,org.eclipse.wst.ws.explorer@default:default,org.eclipse.wst.ws.infopop@default:default,org.eclipse.wst.ws.parser@default:default,org.eclipse.wst.ws.service.policy.ui@default:default,org.eclipse.wst.ws.service.policy@default:default,org.eclipse.wst.ws.ui@default:default,org.eclipse.wst.ws@default:default,org.eclipse.wst.wsdl.doc.isv@default:default,org.eclipse.wst.wsdl.ui.doc.user@default:default,org.eclipse.wst.wsdl.ui@default:default,org.eclipse.wst.wsdl.validation@default:default,org.eclipse.wst.wsdl@default:default,org.eclipse.wst.wsi.ui.doc.user@default:default,org.eclipse.wst.wsi.ui@default:default,org.eclipse.wst.wsi@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.eclipse.wst.xml.xpath.ui@default:default,org.eclipse.wst.xml.xpath2.processor.doc.user@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.wst.xml.xpath2.wtptypes@default:default,org.eclipse.wst.xml.xpath2@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.wst.xsdeditor.doc.user@default:default,org.eclipse.wst.xsl.core@default:default,org.eclipse.wst.xsl.debug.ui@default:default,org.eclipse.wst.xsl.doc@default:default,org.eclipse.wst.xsl.exslt.core@default:default,org.eclipse.wst.xsl.exslt.ui@default:default,org.eclipse.wst.xsl.jaxp.debug.ui@default:default,org.eclipse.wst.xsl.jaxp.debug@default:default,org.eclipse.wst.xsl.jaxp.launching@default:default,org.eclipse.wst.xsl.launching@default:default,org.eclipse.wst.xsl.saxon@default:default,org.eclipse.wst.xsl.sdk.documentation@default:default,org.eclipse.wst.xsl.ui@default:default,org.eclipse.wst.xsl.xalan@default:default,org.eclipse.wst.xsl@default:default,org.eclipse.xsd.cheatsheets@default:default,org.eclipse.xsd.doc@default:default,org.eclipse.xsd.ecore.converter@default:default,org.eclipse.xsd.ecore.exporter@default:default,org.eclipse.xsd.ecore.importer@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd.editor@default:default,org.eclipse.xsd.example.installer@default:default,org.eclipse.xsd.mapping.editor@default:default,org.eclipse.xsd.mapping@default:default,org.eclipse.xsd@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.doc.isv@default:default,org.eclipse.zest.layouts@default:default,org.freemarker.freemarker@default:default,org.hamcrest.core@default:default,org.jdom@default:default,org.junit@default:default,org.mozilla.javascript@default:default,org.ow2.asm.analysis@default:default,org.ow2.asm.tree@default:default,org.ow2.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.uddi4j@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.android.ide.eclipse.adt.package@default:default,com.android.ide.eclipse.adt@default:default,com.android.ide.eclipse.base@default:default,com.android.ide.eclipse.ddms@default:default,com.android.ide.eclipse.gldebugger.tests@default:default,com.android.ide.eclipse.gldebugger@default:default,com.android.ide.eclipse.hierarchyviewer@default:default,com.android.ide.eclipse.ndk@default:default,com.android.ide.eclipse.pdt@default:default,com.android.ide.eclipse.tests@default:false,com.android.ide.eclipse.traceview@default:default,overlay.com.android.ide.eclipse.adt.overlay@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
deleted file mode 100644
index 32d7d7e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
-               icons/,\
-               .,\
-               libs/,\
-               templates/,\
-               about.ini,\
-               about.properties,\
-               NOTICE,\
-               about.html
-source.. = src/
-output.. = bin/
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AbsoluteLayout.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/AbsoluteLayout.png
deleted file mode 100644
index c7d2381..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AbsoluteLayout.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AdapterViewFlipper.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/AdapterViewFlipper.png
deleted file mode 100644
index 89f8c63..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AdapterViewFlipper.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AnalogClock.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/AnalogClock.png
deleted file mode 100644
index 163939c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AnalogClock.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AutoCompleteTextView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/AutoCompleteTextView.png
deleted file mode 100644
index ae7c284..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/AutoCompleteTextView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Button.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/Button.png
deleted file mode 100644
index 3b576c7..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Button.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/CalendarView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/CalendarView.png
deleted file mode 100644
index 033c51c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/CalendarView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/CheckBox.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/CheckBox.png
deleted file mode 100644
index 1321e1e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/CheckBox.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/CheckedTextView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/CheckedTextView.png
deleted file mode 100644
index a8c5f61..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/CheckedTextView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Chronometer.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/Chronometer.png
deleted file mode 100644
index 563f30c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Chronometer.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/DatePicker.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/DatePicker.png
deleted file mode 100644
index 107529e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/DatePicker.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/DialerFilter.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/DialerFilter.png
deleted file mode 100644
index 41652ea..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/DialerFilter.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/DigitalClock.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/DigitalClock.png
deleted file mode 100644
index d3b8740..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/DigitalClock.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/EditText.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/EditText.png
deleted file mode 100644
index bb292ba..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/EditText.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ExpandableListView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ExpandableListView.png
deleted file mode 100644
index fd10697..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ExpandableListView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/FrameLayout.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/FrameLayout.png
deleted file mode 100644
index 66bd042..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/FrameLayout.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Gallery.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/Gallery.png
deleted file mode 100644
index 36b8ff6..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Gallery.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/GestureOverlayView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/GestureOverlayView.png
deleted file mode 100644
index 40acdbf..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/GestureOverlayView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/GridLayout.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/GridLayout.png
deleted file mode 100644
index ca64e8c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/GridLayout.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/GridView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/GridView.png
deleted file mode 100644
index 33ae3cb..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/GridView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/HorizontalScrollView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/HorizontalScrollView.png
deleted file mode 100644
index fa142cb..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/HorizontalScrollView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageButton.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageButton.png
deleted file mode 100644
index 01ef257..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageButton.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageSwitcher.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageSwitcher.png
deleted file mode 100644
index c089a2a..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageSwitcher.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageView.png
deleted file mode 100644
index 1f0ff05..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ImageView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/LinearLayout.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/LinearLayout.png
deleted file mode 100644
index 6d6a794..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/LinearLayout.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ListView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ListView.png
deleted file mode 100644
index 09aaea9..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ListView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/MediaController.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/MediaController.png
deleted file mode 100644
index ef30b34..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/MediaController.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/MultiAutoCompleteTextView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/MultiAutoCompleteTextView.png
deleted file mode 100644
index 94b823f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/MultiAutoCompleteTextView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/NumberPicker.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/NumberPicker.png
deleted file mode 100644
index 7557067..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/NumberPicker.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ProgressBar.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ProgressBar.png
deleted file mode 100644
index 23a98fc..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ProgressBar.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/QuickContactBadge.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/QuickContactBadge.png
deleted file mode 100644
index b8a7a77..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/QuickContactBadge.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RadioButton.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/RadioButton.png
deleted file mode 100644
index 8e55fa7..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RadioButton.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RadioGroup.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/RadioGroup.png
deleted file mode 100644
index 1070b24..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RadioGroup.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RatingBar.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/RatingBar.png
deleted file mode 100644
index 6921212..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RatingBar.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RelativeLayout.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/RelativeLayout.png
deleted file mode 100644
index 976e55f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/RelativeLayout.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ScrollView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ScrollView.png
deleted file mode 100644
index 618f082..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ScrollView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SearchView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/SearchView.png
deleted file mode 100644
index 2b45fc2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SearchView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SeekBar.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/SeekBar.png
deleted file mode 100644
index eeffbca..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SeekBar.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SlidingDrawer.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/SlidingDrawer.png
deleted file mode 100644
index af1e774..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SlidingDrawer.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Space.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/Space.png
deleted file mode 100644
index 28b2553..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Space.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Spinner.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/Spinner.png
deleted file mode 100644
index 34cdc7c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Spinner.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/StackView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/StackView.png
deleted file mode 100644
index 203bafc..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/StackView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SurfaceView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/SurfaceView.png
deleted file mode 100644
index 40b5685..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/SurfaceView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Switch.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/Switch.png
deleted file mode 100644
index 45df979..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/Switch.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TabHost.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TabHost.png
deleted file mode 100644
index 9153a88..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TabHost.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TabWidget.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TabWidget.png
deleted file mode 100644
index 7992fa2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TabWidget.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TableLayout.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TableLayout.png
deleted file mode 100644
index 0a41339..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TableLayout.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TableRow.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TableRow.png
deleted file mode 100644
index 58aeabb..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TableRow.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextSwitcher.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextSwitcher.png
deleted file mode 100644
index 6de1d92..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextSwitcher.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextView.png
deleted file mode 100644
index 5eec764..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextureView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextureView.png
deleted file mode 100644
index 353b6b7..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TextureView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TimePicker.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TimePicker.png
deleted file mode 100644
index 5115f6d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TimePicker.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ToggleButton.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ToggleButton.png
deleted file mode 100644
index 7ee1265..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ToggleButton.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TwoLineListItem.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/TwoLineListItem.png
deleted file mode 100644
index 1000979..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/TwoLineListItem.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/VerticalLinearLayout.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/VerticalLinearLayout.png
deleted file mode 100644
index 1d67620..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/VerticalLinearLayout.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/VideoView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/VideoView.png
deleted file mode 100644
index 509b0a3..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/VideoView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/View.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/View.png
deleted file mode 100644
index f07944f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/View.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewAnimator.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewAnimator.png
deleted file mode 100644
index 7d6bea6..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewAnimator.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewFlipper.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewFlipper.png
deleted file mode 100644
index 300ed2d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewFlipper.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewStub.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewStub.png
deleted file mode 100644
index e5036ff..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewStub.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewSwitcher.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewSwitcher.png
deleted file mode 100644
index adc0abe..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ViewSwitcher.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/WebView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/WebView.png
deleted file mode 100644
index 90b3c06..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/WebView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ZoomButton.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ZoomButton.png
deleted file mode 100644
index 90e0d8b..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ZoomButton.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ZoomControls.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ZoomControls.png
deleted file mode 100644
index 7928c65..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ZoomControls.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/activity.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/activity.png
deleted file mode 100644
index 3612361..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/activity.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/add.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/add.png
deleted file mode 100644
index eefc2ca..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/add.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android-32.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android-32.png
deleted file mode 100644
index 4e0cc13..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android-32.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android-64.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android-64.png
deleted file mode 100644
index 2c6f149..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android-64.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android.png
deleted file mode 100644
index a8dc35e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_app.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_app.png
deleted file mode 100644
index 8ca3770..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_app.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_file.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_file.png
deleted file mode 100644
index be9b8e6..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_file.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_project.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_project.png
deleted file mode 100644
index 5334568..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_project.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/androidjunit.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/androidjunit.png
deleted file mode 100644
index 25826dc..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/androidjunit.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/attribute.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/attribute.png
deleted file mode 100644
index 04508ea..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/attribute.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/avd_manager.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/avd_manager.png
deleted file mode 100644
index f8a173c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/avd_manager.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/az_sort.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/az_sort.png
deleted file mode 100644
index 5d92f76..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/az_sort.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/bidi.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/bidi.png
deleted file mode 100644
index 4ffe131..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/bidi.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/checker.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/checker.png
deleted file mode 100644
index 78908f4..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/checker.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/clipping.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/clipping.png
deleted file mode 100644
index 6f2a35f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/clipping.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/close.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/close.png
deleted file mode 100644
index a94d96c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/close.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/closed-folder.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/closed-folder.png
deleted file mode 100644
index 3fe8d8b..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/closed-folder.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/columns.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/columns.png
deleted file mode 100644
index 6b49eae..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/columns.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/components_view.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/components_view.png
deleted file mode 100644
index 9f9755f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/components_view.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/customView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/customView.png
deleted file mode 100644
index 0ff48d3..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/customView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/default_template.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/default_template.png
deleted file mode 100644
index ddede69..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/default_template.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/delete.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/delete.png
deleted file mode 100644
index db5fab8..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/delete.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/dimension.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/dimension.png
deleted file mode 100644
index 10057c8..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/dimension.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/display.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/display.png
deleted file mode 100644
index 8831f89..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/display.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/dockmode.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/dockmode.png
deleted file mode 100644
index 71d1804..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/dockmode.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/down.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/down.png
deleted file mode 100644
index 162e736..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/down.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/dpi.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/dpi.png
deleted file mode 100644
index fae5e96..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/dpi.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/draw9patch-16.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/draw9patch-16.png
deleted file mode 100644
index cc080e7..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/draw9patch-16.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editPreview.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/editPreview.png
deleted file mode 100644
index fd36133..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editPreview.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_design.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_design.png
deleted file mode 100644
index a19f3b0..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_design.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_source.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_source.png
deleted file mode 100644
index 874cc1e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_source.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/element.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/element.png
deleted file mode 100644
index e5cd0ca..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/element.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/error-badge.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/error-badge.png
deleted file mode 100644
index 2e63c35..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/error-badge.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/error.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/error.png
deleted file mode 100644
index 1eecf2c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/error.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/expandall-disabled.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/expandall-disabled.png
deleted file mode 100644
index 0897da3..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/expandall-disabled.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/expandall.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/expandall.png
deleted file mode 100644
index 7bdf83d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/expandall.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/explode.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/explode.png
deleted file mode 100644
index f250055..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/explode.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/filter_advanced_properties.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/filter_advanced_properties.png
deleted file mode 100644
index 5f5b078..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/filter_advanced_properties.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/flip_landscape.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/flip_landscape.png
deleted file mode 100644
index 4940cea..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/flip_landscape.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/flip_portrait.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/flip_portrait.png
deleted file mode 100644
index c28a980..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/flip_portrait.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/fragment.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/fragment.png
deleted file mode 100644
index 4e31546..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/fragment.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/globe.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/globe.png
deleted file mode 100644
index 45e5e05..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/globe.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/goto_definition.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/goto_definition.png
deleted file mode 100644
index daac537..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/goto_definition.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/gradle.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/gradle.png
deleted file mode 100644
index 63ba4c2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/gradle.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/height.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/height.png
deleted file mode 100644
index 33c0774..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/height.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-all-disabled.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-all-disabled.png
deleted file mode 100644
index 56f0098..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-all-disabled.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-all.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-all.png
deleted file mode 100644
index 581e323..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-all.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-file-disabled.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-file-disabled.png
deleted file mode 100644
index e995699..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-file-disabled.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-file.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-file.png
deleted file mode 100644
index 12d656d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-file.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-project-disabled.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-project-disabled.png
deleted file mode 100644
index 33e21a5..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-project-disabled.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-project.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-project.png
deleted file mode 100644
index d8e0975..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-project.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-this-disabled.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-this-disabled.png
deleted file mode 100644
index 0576450..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-this-disabled.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-this.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-this.png
deleted file mode 100644
index 3e66d82..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ignore-this.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/include.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/include.png
deleted file mode 100644
index d8eecd9..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/include.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/keyboard.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/keyboard.png
deleted file mode 100644
index 7911a85..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/keyboard.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/landscape.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/landscape.png
deleted file mode 100644
index 4ed5c2e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/landscape.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/language.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/language.png
deleted file mode 100644
index a727dd5..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/language.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint1.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint1.png
deleted file mode 100644
index f429164..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint1.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint2.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint2.png
deleted file mode 100644
index 8434b78..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint2.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint3.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint3.png
deleted file mode 100644
index 43ab63e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint3.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint4.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint4.png
deleted file mode 100644
index 67fee2d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint4.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint5.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint5.png
deleted file mode 100644
index 3d0c188..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint5.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint6.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint6.png
deleted file mode 100644
index 42a9767..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint6.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint7.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint7.png
deleted file mode 100644
index 743aabc..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint7.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint8.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint8.png
deleted file mode 100644
index 927067a..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint8.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint9.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint9.png
deleted file mode 100644
index 44e66a0..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint9.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint9p.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint9p.png
deleted file mode 100644
index 853ace9..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lint9p.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lintrun.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lintrun.png
deleted file mode 100644
index d1a074b..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lintrun.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lintview.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/lintview.png
deleted file mode 100644
index c22d68d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/lintview.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/mainLaunchTab.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/mainLaunchTab.png
deleted file mode 100644
index 2540fbb..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/mainLaunchTab.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/match.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/match.png
deleted file mode 100644
index 7e939c2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/match.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/match_multiple.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/match_multiple.png
deleted file mode 100644
index 79ffc2d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/match_multiple.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/mcc.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/mcc.png
deleted file mode 100644
index 4dc95d7..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/mcc.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/merge.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/merge.png
deleted file mode 100644
index 18087bd..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/merge.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/minimizePreview.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/minimizePreview.png
deleted file mode 100644
index 4ddc540..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/minimizePreview.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/mnc.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/mnc.png
deleted file mode 100644
index aefffe4..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/mnc.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/navpad.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/navpad.png
deleted file mode 100644
index c2bb79a..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/navpad.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newConfig.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/newConfig.png
deleted file mode 100644
index d6317df..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newConfig.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newCustomView.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/newCustomView.png
deleted file mode 100644
index dc64f4f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newCustomView.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newJunit.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/newJunit.png
deleted file mode 100644
index e881e79..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newJunit.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_adt_project.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_adt_project.png
deleted file mode 100644
index 0f0e883..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_adt_project.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_asset_set.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_asset_set.png
deleted file mode 100644
index 108dcb1..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_asset_set.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_xml.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_xml.png
deleted file mode 100644
index 59e1891..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/new_xml.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newannotation.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/newannotation.png
deleted file mode 100644
index d2e4721..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/newannotation.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/nightmode.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/nightmode.png
deleted file mode 100644
index a04e4cf..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/nightmode.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/open-folder.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/open-folder.png
deleted file mode 100644
index 8c4a2e1..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/open-folder.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/options.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/options.png
deleted file mode 100644
index 01948a2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/options.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/orientation.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/orientation.png
deleted file mode 100644
index 53b5e62..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/orientation.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/outline.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/outline.png
deleted file mode 100644
index dbfb63b..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/outline.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/palette.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/palette.png
deleted file mode 100644
index fd7ca1c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/palette.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/portrait.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/portrait.png
deleted file mode 100644
index 3786153..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/portrait.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/properties_default.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/properties_default.png
deleted file mode 100644
index 5696a31..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/properties_default.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/properties_view.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/properties_view.png
deleted file mode 100644
index 8df5d2d..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/properties_view.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix-disabled.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix-disabled.png
deleted file mode 100644
index 262bdac..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix-disabled.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix.png
deleted file mode 100644
index a433199..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix_error.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix_error.png
deleted file mode 100644
index 92022ee..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix_error.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix_warning.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix_warning.png
deleted file mode 100644
index bfbde37..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/quickfix_warning.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ratio.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/ratio.png
deleted file mode 100644
index 8bf07f2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/ratio.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/refresh.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/refresh.png
deleted file mode 100644
index 7cbebf4..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/refresh.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/refreshPreview.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/refreshPreview.png
deleted file mode 100644
index d103763..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/refreshPreview.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/region.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/region.png
deleted file mode 100644
index 9608cd6..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/region.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/renderError.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/renderError.png
deleted file mode 100644
index 95be641..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/renderError.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/requestFocus.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/requestFocus.png
deleted file mode 100644
index ed239d4..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/requestFocus.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/restorePreview.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/restorePreview.png
deleted file mode 100644
index d6b3f32..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/restorePreview.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/sdk_manager.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/sdk_manager.png
deleted file mode 100644
index 08ffda8..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/sdk_manager.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-b.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-b.png
deleted file mode 100644
index 68f4f4b..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-b.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-bl.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-bl.png
deleted file mode 100644
index ee7dbe8..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-bl.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-br.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-br.png
deleted file mode 100644
index c45ad77..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-br.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-r.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-r.png
deleted file mode 100644
index 4af7a33..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-r.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-tr.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-tr.png
deleted file mode 100644
index 1fd0c77..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow-tr.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-b.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-b.png
deleted file mode 100644
index 963973e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-b.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-bl.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-bl.png
deleted file mode 100644
index 7612487..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-bl.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-br.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-br.png
deleted file mode 100644
index 8e20252..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-br.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-r.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-r.png
deleted file mode 100644
index 8e026f1..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-r.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-tr.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-tr.png
deleted file mode 100644
index 590373c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/shadow2-tr.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/size.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/size.png
deleted file mode 100644
index c8a82b0..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/size.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/sort_alpha.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/sort_alpha.png
deleted file mode 100644
index 112e05b..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/sort_alpha.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/square.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/square.png
deleted file mode 100644
index 7cc8a4c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/square.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/swidth.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/swidth.png
deleted file mode 100644
index b74a68f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/swidth.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/text_input.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/text_input.png
deleted file mode 100644
index b4ddc87..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/text_input.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/themes.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/themes.png
deleted file mode 100644
index c96394c..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/themes.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/touch.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/touch.png
deleted file mode 100644
index 6536576..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/touch.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/up.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/up.png
deleted file mode 100644
index fac118b..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/up.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/version.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/version.png
deleted file mode 100644
index a8dc35e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/version.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/view_menu.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/view_menu.png
deleted file mode 100644
index 8575107..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/view_menu.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/warning-badge.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/warning-badge.png
deleted file mode 100644
index d71d6e3..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/warning-badge.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/warning.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/warning.png
deleted file mode 100644
index ca3b6ed..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/warning.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/width.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/width.png
deleted file mode 100644
index e5243fa..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/width.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoom100.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoom100.png
deleted file mode 100644
index b127559..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoom100.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomfit.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomfit.png
deleted file mode 100644
index 242b24a..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomfit.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomminus.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomminus.png
deleted file mode 100644
index aa6409e..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomminus.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomplus.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomplus.png
deleted file mode 100644
index dbbd5c8..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomplus.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomreal.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomreal.png
deleted file mode 100644
index 2a020e0..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/zoomreal.png
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
deleted file mode 100644
index 5584914..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
+++ /dev/null
@@ -1,1340 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-    <extension
-        id="com.android.ide.eclipse.common.xmlProblem"
-        name="Android XML Format Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.common.aaptProblem"
-        name="Android AAPT Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.common.aapt2Problem"
-        name="Android AAPT Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.common.aidlProblem"
-        name="Android AIDL Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.common.rsProblem"
-        name="Android RenderScript Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.common.androidProblem"
-        name="Android XML Content Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.adt.lintProblem"
-        name="Android Lint Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.adt.manifMergerProblem"
-        name="Android Manifest Merger Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.adt.adtProblem"
-        name="Android ADT Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <super type="org.eclipse.core.resources.textmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.adt.targetProblem"
-        name="Android Target Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <persistent value="false" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.adt.buildToolsProblem"
-        name="Android Build Tools Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <persistent value="false" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.adt.dependencyProblem"
-        name="Android Dependency Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <persistent value="false" />
-    </extension>
-    <extension
-        id="com.android.ide.eclipse.adt.packagingProblem"
-        name="Android Packaging Problem"
-        point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.problemmarker" />
-        <persistent value="true" />
-    </extension>
-    <extension point="org.eclipse.ui.ide.markerResolution">
-        <markerResolutionGenerator
-            markerType="com.android.ide.eclipse.adt.lintProblem"
-            class="com.android.ide.eclipse.adt.internal.lint.LintFixGenerator" />
-        <markerResolutionGenerator
-            markerType="com.android.ide.eclipse.common.aaptProblem"
-            class="com.android.ide.eclipse.adt.internal.build.AaptQuickFix" />
-    </extension>
-    <extension
-        id="ResourceManagerBuilder"
-        name="Android Resource Manager"
-        point="org.eclipse.core.resources.builders">
-        <builder hasNature="true">
-            <run class="com.android.ide.eclipse.adt.internal.build.builders.ResourceManagerBuilder" />
-        </builder>
-    </extension>
-    <extension
-        id="PreCompilerBuilder"
-        name="Android Pre Compiler"
-        point="org.eclipse.core.resources.builders">
-        <builder hasNature="true">
-            <run class="com.android.ide.eclipse.adt.internal.build.builders.PreCompilerBuilder" />
-        </builder>
-    </extension>
-    <extension
-        id="ApkBuilder"
-        name="Android Package Builder"
-        point="org.eclipse.core.resources.builders">
-        <builder hasNature="true">
-            <run class="com.android.ide.eclipse.adt.internal.build.builders.PostCompilerBuilder" />
-        </builder>
-    </extension>
-    <extension
-        id="AndroidNature"
-        name="Android Project Nature"
-        point="org.eclipse.core.resources.natures">
-        <runtime>
-            <run class="com.android.ide.eclipse.adt.internal.project.AndroidNature" />
-        </runtime>
-        <builder id="com.android.ide.eclipse.adt.ResourceManagerBuilder" />
-        <builder id="com.android.ide.eclipse.adt.PreCompilerBuilder" />
-        <builder id="com.android.ide.eclipse.adt.ApkBuilder" />
-    </extension>
-    <extension
-        id="ExportNature"
-        name="Android Export Project Nature"
-        point="org.eclipse.core.resources.natures">
-        <runtime>
-            <run class="com.android.ide.eclipse.adt.internal.project.ExportNature" />
-        </runtime>
-    </extension>
-    <extension
-        point="org.eclipse.ui.importWizards">
-        <category
-            id="com.android.ide.eclipse.wizards.category"
-            name="Android" />
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.newproject.ImportProjectWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_adt_project.png"
-            id="com.android.ide.eclipse.adt.project.ImportProjectWizard"
-            name="Existing Android Code Into Workspace"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="true">
-        </wizard>
-    </extension>
-    <extension point="org.eclipse.ui.newWizards">
-        <category
-            id="com.android.ide.eclipse.wizards.category"
-            name="Android" />
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.templates.NewProjectWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_adt_project.png"
-            id="com.android.ide.eclipse.adt.project.NewProjectWizard"
-            name="Android Application Project"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="true" >
-            <description>
-               Create an Android Application Project
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.newproject.NewTestProjectWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/newJunit.png"
-            id="com.android.ide.eclipse.adt.project.NewTestProjectWizard"
-            name="Android Test Project"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="true">
-            <description>
-               Create an Android Test Project
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.newproject.NewSampleProjectWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_adt_project.png"
-            id="com.android.ide.eclipse.adt.project.NewSampleProjectWizard"
-            name="Android Sample Project"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="true">
-            <description>
-               Create an Android Sample Project
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.newproject.ImportProjectWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_adt_project.png"
-            id="com.android.ide.eclipse.adt.project.ImportProjectWizard.NewPrj"
-            name="Android Project from Existing Code"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="true">
-            <description>
-               Create one or more Android projects from existing code
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.newxmlfile.NewXmlFileWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_xml.png"
-            id="com.android.ide.eclipse.editors.wizards.NewXmlFileWizard"
-            name="Android XML File"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false">
-            <description>
-               Create an Android resource XML file
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.newxmlfile.NewXmlFileWizard$NewLayoutWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_xml.png"
-            id="com.android.ide.eclipse.editors.wizards.NewXmlFileWizard.Layout"
-            name="Android XML Layout File"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false">
-            <description>
-               Create an Android layout XML file
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.newxmlfile.NewXmlFileWizard$NewValuesWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_xml.png"
-            id="com.android.ide.eclipse.editors.wizards.NewXmlFileWizard.Values"
-            name="Android XML Values File"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false">
-            <description>
-               Create an Android XML values file such as strings.xml
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.templates.NewActivityWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_adt_project.png"
-            id="com.android.ide.eclipse.editors.wizards.NewActivityWizard"
-            name="Android Activity"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false" >
-            <description>
-               Create an Android Activity
-            </description>
-        </wizard>
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.templates.NewActivityWizard$OtherWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/newCustomView.png"
-            id="com.android.ide.eclipse.editors.wizards.NewActivityWizard.OtherWizard"
-            name="Android Object"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false" >
-            <description>
-               Create an Android object such as a Service, an Activity, a Broadcast Receiver, a Notification, etc.
-            </description>
-        </wizard>
-        <!-- Available through generic object list above
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.templates.NewTemplateWizard$NewCustomViewWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/newCustomView.png"
-            id="com.android.ide.eclipse.editors.wizards.NewTemplateWizard.CustomView"
-            name="Android Custom View"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false" >
-            <description>
-               Create an Android custom view
-            </description>
-        </wizard>
-        -->
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.assetstudio.CreateAssetSetWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/new_asset_set.png"
-            id="com.android.ide.eclipse.adt.internal.assetstudio.CreateAssetSetWizard"
-            name="Android Icon Set"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false" >
-            <description>
-               Create an Android icon set
-            </description>
-        </wizard>
-
-        <!-- During development only: Support for testing templates -->
-        <wizard
-            canFinishEarly="false"
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.templates.TemplateTestWizard"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            hasPages="true"
-            icon="icons/androidjunit.png"
-            id="com.android.ide.eclipse.editors.wizards.TemplateTestWizard"
-            name="Template Development Wizard"
-            preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective"
-            project="false" />
-    </extension>
-    <extension point="org.eclipse.debug.core.launchConfigurationTypes">
-        <launchConfigurationType
-            delegate="com.android.ide.eclipse.adt.internal.launch.LaunchConfigDelegate"
-            delegateDescription="The Android Application Launcher supports running and debugging remote Android applications on devices or emulators."
-            delegateName="Android Launcher"
-            id="com.android.ide.eclipse.adt.debug.LaunchConfigType"
-            modes="debug, run"
-            name="Android Application"
-            public="true"
-            sourceLocatorId="com.android.ide.eclipse.adt.internal.sourcelookup.AdtSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-        </launchConfigurationType>
-    </extension>
-    <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-        <launchConfigurationTypeImage
-            configTypeID="com.android.ide.eclipse.adt.debug.LaunchConfigType"
-            icon="icons/android_app.png"
-            id="com.android.ide.eclipse.adt.debug.LaunchConfigTypeImage" />
-    </extension>
-    <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-        <launchConfigurationTabGroup
-            class="com.android.ide.eclipse.adt.internal.launch.LaunchConfigTabGroup"
-            description="Android Application"
-            id="com.android.ide.eclipse.adt.debug.LaunchConfigTabGroup"
-            type="com.android.ide.eclipse.adt.debug.LaunchConfigType" />
-    </extension>
-    <extension point="org.eclipse.debug.ui.launchShortcuts">
-        <shortcut
-            class="com.android.ide.eclipse.adt.internal.launch.LaunchShortcut"
-            icon="icons/android_app.png"
-            id="com.android.ide.eclipse.adt.debug.launching.LaunchShortcut"
-            label="Android Application"
-            modes="run, debug">
-            <contextualLaunch>
-                <enablement>
-                    <with variable="selection">
-                        <count value="1" />
-                        <iterate>
-                            <or>
-                                <adapt type="org.eclipse.core.resources.IFile">
-                                    <and>
-                                        <test
-                                            property="org.eclipse.core.resources.contentTypeId"
-                                            value="org.eclipse.core.runtime.xml" />
-                                        <test
-                                            property="org.eclipse.core.resources.projectNature"
-                                            value="com.android.ide.eclipse.adt.AndroidNature" />
-                                    </and>
-                                </adapt>
-                                <and>
-                                    <test property="org.eclipse.jdt.launching.isContainer" />
-                                    <test
-                                        property="org.eclipse.jdt.launching.hasProjectNature"
-                                        args="com.android.ide.eclipse.adt.AndroidNature" />
-                                </and>
-                            </or>
-                        </iterate>
-                    </with>
-                </enablement>
-            </contextualLaunch>
-            <perspective id="org.eclipse.jdt.ui.JavaPerspective" />
-            <perspective id="org.eclipse.debug.ui.DebugPerspective" />
-            <configurationType id="com.android.ide.eclipse.adt.debug.LaunchConfigType">
-            </configurationType>
-            <description
-                description="Runs an Android Application"
-                mode="run">
-            </description>
-            <description
-                description="Debugs an Android Application"
-                mode="debug">
-            </description>
-        </shortcut>
-    </extension>
-    <extension point="org.eclipse.ui.popupMenus">
-        <objectContribution
-            id="com.android.ide.eclipse.adt.contribution2"
-            nameFilter="*"
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true">
-            <menu
-                id="com.android.ide.eclipse.adt.AndroidTools"
-                label="Android Tools"
-                path="additions">
-                <separator name="group1" />
-                <separator name="group2" />
-                <separator name="group3" />
-                <separator name="group4" />
-            </menu>
-            <filter
-                name="projectNature"
-                value="com.android.ide.eclipse.adt.AndroidNature">
-            </filter>
-            <action
-                class="com.android.ide.eclipse.adt.internal.wizards.actions.NewXmlFileAction"
-                enablesFor="1"
-                icon="icons/new_xml.png"
-                id="com.android.ide.eclipse.adt.wizards.actions.NewXmlFileAction"
-                label="New Resource File..."
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group1"
-                tooltip="Opens a wizard to help create a new Android XML Resource file">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.wizards.actions.NewTestProjectAction"
-                enablesFor="1"
-                icon="icons/androidjunit.png"
-                id="com.android.ide.eclipse.adt.wizards.actions.NewTestProjectAction"
-                label="New Test Project..."
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group1"
-                tooltip="Opens a wizard to help create a new Android Test Project">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.wizards.actions.ExportAction"
-                enablesFor="1"
-                id="com.android.ide.eclipse.adt.project.ExportAction"
-                label="Export Unsigned Application Package..."
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group2" />
-            <action
-                class="com.android.ide.eclipse.adt.internal.wizards.actions.ExportWizardAction"
-                enablesFor="1"
-                id="com.android.ide.eclipse.adt.project.ExportWizardAction"
-                label="Export Signed Application Package..."
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group2" />
-            <action
-                class="com.android.ide.eclipse.adt.internal.actions.FixProjectAction"
-                enablesFor="1"
-                id="com.android.ide.eclipse.adt.project.FixProjectAction"
-                label="Fix Project Properties"
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group3" />
-            <action
-                class="com.android.ide.eclipse.adt.internal.actions.AddSupportJarAction"
-                enablesFor="1"
-                icon="icons/android.png"
-                id="com.android.ide.eclipse.adt.wizards.actions.AddCompatibilityJarAction"
-                label="Add Support Library..."
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group3"
-                tooltip="Add the Compatibility Library to the project">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.refactorings.renamepackage.RenamePackageAction"
-                enablesFor="1"
-                id="com.android.ide.eclipse.adt.project.RenamePackageAction"
-                label="Rename Application Package"
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group3" />
-            <action
-                class="com.android.ide.eclipse.adt.internal.actions.DexDumpAction"
-                enablesFor="1"
-                id="com.android.ide.eclipse.adt.DexDumpAction"
-                label="Display dex bytecode"
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group3" />
-            <action
-                class="com.android.ide.eclipse.adt.internal.lint.ClearLintMarkersAction"
-                enablesFor="1"
-                id="com.android.ide.eclipse.adt.internal.lint.ClearLintMarkersAction"
-                label="Clear Lint Markers"
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group4" />
-            <action
-                class="com.android.ide.eclipse.adt.internal.lint.RunLintAction"
-                enablesFor="1"
-                id="com.android.ide.eclipse.adt.internal.lint.RunLintAction"
-                label="Run Lint: Check for Common Errors"
-                icon="icons/lintrun.png"
-                menubarPath="com.android.ide.eclipse.adt.AndroidTools/group4" />
-        </objectContribution>
-    </extension>
-    <extension point="org.eclipse.ui.preferencePages">
-        <page
-            class="com.android.ide.eclipse.adt.internal.preferences.AndroidPreferencePage"
-            id="com.android.ide.eclipse.preferences.main"
-            name="Android" />
-        <page
-            category="com.android.ide.eclipse.preferences.main"
-            class="com.android.ide.eclipse.adt.internal.preferences.BuildPreferencePage"
-            id="com.android.ide.eclipse.adt.preferences.BuildPreferencePage"
-            name="Build" />
-        <page
-            category="com.android.ide.eclipse.preferences.main"
-            class="com.android.ide.eclipse.adt.internal.preferences.LaunchPreferencePage"
-            id="com.android.ide.eclipse.adt.preferences.LaunchPreferencePage"
-            name="Launch" />
-        <page
-            category="com.android.ide.eclipse.preferences.main"
-            class="com.android.ide.eclipse.adt.internal.preferences.EditorsPage"
-            id="com.android.ide.eclipse.adt.preferences.EditorsPage"
-            name="Editors">
-        </page>
-        <page
-            category="com.android.ide.eclipse.preferences.main"
-            class="com.android.ide.eclipse.adt.internal.preferences.LintPreferencePage"
-            id="com.android.ide.eclipse.common.preferences.LintPreferencePage"
-            name="Lint Error Checking">
-        </page>
-    </extension>
-    <extension point="org.eclipse.core.runtime.preferences">
-        <initializer class="com.android.ide.eclipse.adt.internal.preferences.AdtPrefs" />
-    </extension>
-    <extension point="org.eclipse.ui.perspectiveExtensions">
-        <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
-            <newWizardShortcut id="com.android.ide.eclipse.adt.project.NewProjectWizard" />
-            <newWizardShortcut id="com.android.ide.eclipse.editors.wizards.NewXmlFileWizard" />
-            <actionSet id="adt.actionSet.wizards" />
-            <actionSet id="adt.actionSet.avdManager" />
-            <actionSet id="adt.actionSet.lint" />
-            <actionSet id="adt.actionSet.refactorings" />
-        </perspectiveExtension>
-        <perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective">
-            <viewShortcut id="com.android.ide.eclipse.ddms.views.LogCatView" />
-            <viewShortcut id="com.android.ide.eclipse.ddms.views.DeviceView" />
-        </perspectiveExtension>
-    </extension>
-    <extension point="org.eclipse.ui.ide.projectNatureImages">
-        <image
-            icon="icons/android_project.png"
-            id="com.android.ide.eclipse.adt.AndroidNature.image"
-            natureId="com.android.ide.eclipse.adt.AndroidNature">
-        </image>
-    </extension>
-    <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-        <classpathContainerInitializer
-            class="com.android.ide.eclipse.adt.internal.project.AndroidClasspathContainerInitializer"
-            id="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK">
-        </classpathContainerInitializer>
-        <classpathContainerInitializer
-            class="com.android.ide.eclipse.adt.internal.project.LibraryClasspathContainerInitializer"
-            id="com.android.ide.eclipse.adt.LIBRARIES">
-        </classpathContainerInitializer>
-        <classpathContainerInitializer
-            class="com.android.ide.eclipse.adt.internal.project.LibraryClasspathContainerInitializer"
-            id="com.android.ide.eclipse.adt.DEPENDENCIES">
-        </classpathContainerInitializer>
-    </extension>
-    <extension point="org.eclipse.jdt.ui.classpathContainerPage">
-        <classpathContainerPage
-            name="Android Classpath Container"
-            class="com.android.ide.eclipse.adt.internal.project.AndroidClasspathContainerPage"
-            id="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK">
-        </classpathContainerPage>
-    </extension>
-    <extension point="org.eclipse.ui.exportWizards">
-        <category
-            id="com.android.ide.eclipse.wizards.category"
-            name="Android">
-        </category>
-        <wizard
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.export.ExportWizard"
-            icon="icons/android.png"
-            id="com.android.ide.eclipse.adt.project.ExportWizard"
-            name="Export Android Application">
-        </wizard>
-    </extension>
-    <extension point="org.eclipse.ui.exportWizards">
-        <category
-            id="com.android.ide.eclipse.wizards.category"
-            name="Android">
-        </category>
-        <wizard
-            category="com.android.ide.eclipse.wizards.category"
-            class="com.android.ide.eclipse.adt.internal.wizards.exportgradle.GradleExportWizard"
-            icon="icons/gradle.png"
-            id="com.android.ide.eclipse.adt.project.ExportGradleWizard"
-            name="Generate Gradle build files">
-            <selection
-                class="org.eclipse.jdt.core.IJavaProject">
-            </selection>
-        </wizard>
-    </extension>
-    <extension point="org.eclipse.ui.commands">
-        <command
-            name="Debug Android Application"
-            description="Debug Android Application"
-            categoryId="org.eclipse.debug.ui.category.run"
-            id="com.android.ide.eclipse.adt.launch.LaunchShortcut.debug">
-        </command>
-        <command
-            name="Run Android Application"
-            description="Run Android Application"
-            categoryId="org.eclipse.debug.ui.category.run"
-            id="com.android.ide.eclipse.adt.launch.LaunchShortcut.run">
-        </command>
-    </extension>
-    <extension point="org.eclipse.ui.decorators">
-        <decorator
-            adaptable="true"
-            class="com.android.ide.eclipse.adt.internal.project.FolderDecorator"
-            id="com.android.ide.eclipse.adt.project.FolderDecorator"
-            label="Android Decorator"
-            lightweight="true"
-            location="TOP_RIGHT"
-            objectClass="org.eclipse.core.resources.IFolder"
-            state="true">
-        </decorator>
-    </extension>
-    <extension point="org.eclipse.ui.editors">
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.export.ExportEditor"
-            default="true"
-            filenames="export.properties"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.export.ExportEditor"
-            name="Android Export Editor">
-        </editor>
-
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.manifest.ManifestEditor"
-            default="true"
-            filenames="AndroidManifest.xml"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.manifest.ManifestEditor"
-            name="Android Manifest Editor">
-        </editor>
-
-        <!--
-        This is the new generic multi-purpose single XML editor used by ADT.
-        It is designed to replace all the other XML editors (layout, manifest, drawable,
-        animation, color, values, xml) and does so by using a single common Editor class
-        that defers to multiple delegate handlers.
-        -->
-        <editor
-              class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-              contributorClass="com.android.ide.eclipse.adt.internal.editors.common.CommonActionContributor"
-              default="true"
-              extensions="xml"
-              icon="icons/android_file.png"
-              id="com.android.ide.eclipse.editors.CommonXmlEditor"
-              matchingStrategy="com.android.ide.eclipse.adt.internal.editors.common.CommonMatchingStrategy"
-              name="Android Common XML Editor">
-        </editor>
-
-        <!--
-        For compatibilit with existing ADT installs, we still need to keep the editor
-        IDs of the previously defined editors. E.g. for the color editor note that the
-        id remains the same but class name changes to the new class. This will make
-        Eclipse not complain upon startup of an existing workspace.
-        -->
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-            contributorClass="com.android.ide.eclipse.adt.internal.editors.common.CommonActionContributor"
-            default="false"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.layout.LayoutEditor"
-            matchingStrategy="com.android.ide.eclipse.adt.internal.editors.common.CommonMatchingStrategy"
-            name="Legacy Android Layout Editor">
-        </editor>
-       <editor
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-            default="false"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.resources.ResourcesEditor"
-            name="Legacy Android Resource Editor">
-        </editor>
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-            default="false"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.menu.MenuEditor"
-            name="Legacy Android Menu Editor">
-        </editor>
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-            default="false"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.xml.XmlEditor"
-            name="Legacy Android Xml Resources Editor">
-        </editor>
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-            default="false"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.animator.AnimationEditor"
-            name="Legacy Android Animation Editor">
-        </editor>
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-            default="false"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.drawable.DrawableEditor"
-            name="Legacy Android Drawable Editor">
-        </editor>
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonXmlEditor"
-            default="false"
-            icon="icons/android_file.png"
-            id="com.android.ide.eclipse.editors.color.ColorEditor"
-            name="Legacy Android Color Editor">
-        </editor>
-
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.binaryxml.BinaryXMLMultiPageEditorPart"
-            contributorClass="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorActionBarContributor"
-            icon="$nl$/icons/android_file.png"
-            id="com.android.ide.eclipse.adt.binedit.BinaryXMLMultiPageEditorPart"
-            name="Android Binary XML editor"
-            symbolicFontName="org.eclipse.wst.sse.ui.textfont">
-            <contentTypeBinding contentTypeId="com.android.ide.eclipse.adt.binaryXml">
-            </contentTypeBinding>
-        </editor>
-        <editor
-            class="com.android.ide.eclipse.adt.internal.editors.draw9patch.Draw9PatchEditor"
-            contributorClass="com.android.ide.eclipse.adt.internal.editors.common.CommonActionContributor"
-            icon="icons/android_file.png"
-            id="draw9patchplugin.editors.Draw9PatchEditor"
-            name="Android Draw 9-patch Editor"
-            extensions="9.png">
-        </editor>
-    </extension>
-    <extension point="org.eclipse.ui.views">
-        <view
-            allowMultiple="false"
-            category="com.android.ide.eclipse.ddms.views.category"
-            class="com.android.ide.eclipse.adt.internal.ui.ResourceExplorerView"
-            icon="icons/draw9patch-16.png"
-            id="com.android.ide.eclipse.editors.resources.explorer.ResourceExplorerView"
-            name="Resource Explorer">
-        </view>
-        <view
-              class="com.android.ide.eclipse.adt.internal.lint.LintViewPart"
-              category="com.android.ide.eclipse.ddms.views.category"
-              id="com.android.ide.eclipse.adt.internal.lint.LintViewPart"
-              icon="icons/lintview.png"
-              name="Lint Warnings">
-        </view>
-    </extension>
-    <extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-        <sourceViewerConfiguration
-            class="com.android.ide.eclipse.adt.internal.editors.manifest.ManifestSourceViewerConfig"
-            target="com.android.ide.eclipse.editors.manifest.ManifestEditor">
-        </sourceViewerConfiguration>
-        <sourceViewerConfiguration
-            class="com.android.ide.eclipse.adt.internal.editors.common.CommonSourceViewerConfig"
-            target="com.android.ide.eclipse.editors.CommonXmlEditor">
-        </sourceViewerConfiguration>
-        <quickOutlineConfiguration
-            class="com.android.ide.eclipse.adt.internal.editors.AndroidQuickOutlineConfiguration"
-            target="org.eclipse.core.runtime.xml" />
-        <contentOutlineConfiguration
-            class="com.android.ide.eclipse.adt.internal.editors.AndroidOutlineConfiguration"
-            target="org.eclipse.core.runtime.xml" />
-        <doubleClickStrategy
-            class="com.android.ide.eclipse.adt.internal.editors.AndroidDoubleClickStrategy"
-            target="org.eclipse.wst.xml.XML_DEFAULT" />
-        <provisionalConfiguration
-            type="org.eclipse.jface.text.quickassist.IQuickAssistProcessor"
-            class="com.android.ide.eclipse.adt.internal.editors.formatting.XmlQuickAssistManager"
-            target="org.eclipse.wst.xml.XML_DEFAULT" />
-        <provisionalConfiguration
-            type="characterpairmatcher"
-            class="com.android.ide.eclipse.adt.internal.editors.AndroidXmlCharacterMatcher"
-            target="org.eclipse.core.runtime.xml" />
-    </extension>
-    <extension point="org.eclipse.jdt.ui.quickAssistProcessors">
-        <quickAssistProcessor
-            id="AndroidJavaAssistant"
-            name="Android Java Quick Assistant"
-            requiredSourceLevel="1.5"
-            class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.JavaQuickAssistant">
-        </quickAssistProcessor>
-    </extension>
-    <extension
-        point="org.eclipse.jdt.ui.quickFixProcessors">
-        <quickFixProcessor
-            name="Android Convert Switch Quickfix Processor"
-            class="com.android.ide.eclipse.adt.internal.build.ConvertSwitchQuickFixProcessor"
-            id="com.android.ide.eclipse.adt.internal.build.ConvertSwitchQuickFixProcessor">
-            <handledMarkerTypes>
-                <markerType id="org.eclipse.jdt.core.problem"/>
-            </handledMarkerTypes>
-        </quickFixProcessor>
-    </extension>
-    <extension point="org.eclipse.ui.propertyPages">
-        <page
-            adaptable="true"
-            class="com.android.ide.eclipse.adt.internal.properties.AndroidPropertyPage"
-            id="com.android.ide.eclipse.adt.project.properties.AndroidPropertyPage"
-            name="Android"
-            nameFilter="*"
-            objectClass="org.eclipse.core.resources.IProject">
-            <enabledWhen>
-                <test
-                    property="org.eclipse.jdt.launching.hasProjectNature"
-                    args="com.android.ide.eclipse.adt.AndroidNature" />
-            </enabledWhen>
-        </page>
-        <page
-            class="com.android.ide.eclipse.adt.internal.preferences.LintPreferencePage"
-            id="com.android.ide.eclipse.adt.internal.preferences.LintPreferencePage"
-            name="Android Lint Preferences">
-            <filter
-                name="nature"
-                value="com.android.ide.eclipse.adt.AndroidNature">
-            </filter>
-            <enabledWhen>
-                <adapt type="org.eclipse.core.resources.IProject" />
-            </enabledWhen>
-        </page>
-    </extension>
-    <extension point="org.eclipse.ui.actionSets">
-        <actionSet
-            description="Android Wizards"
-            id="adt.actionSet.wizards"
-            label="Android Wizards"
-            visible="false">
-            <action
-                class="com.android.ide.eclipse.adt.internal.wizards.actions.NewXmlFileAction"
-                icon="icons/new_xml.png"
-                id="com.android.ide.eclipse.adt.wizards.actions.NewXmlFileAction"
-                label="New Android XML File"
-                style="push"
-                toolbarPath="android_project">
-            </action>
-        </actionSet>
-        <actionSet
-            description="Refactorings for Android"
-            id="adt.actionSet.refactorings"
-            label="Android Refactorings"
-            visible="false">
-
-         <!-- This duplicates the Refactoring Menu definition from the jdt.ui plugin.xml,
-              which allows us to insert our contribution even if the JDT is not loaded.
-              We overload the definition with our new group.-->
-            <menu
-                label="Refactor"
-                path="edit"
-                id="org.eclipse.jdt.ui.refactoring.menu">
-                <separator name="undoRedoGroup" />
-                <separator name="reorgGroup" />
-                <separator name="androidGroup" />
-                <separator name="codingGroup" />
-                <separator name="reorgGroup2" />
-                <separator name="typeGroup" />
-                <separator name="typeGroup2" />
-                <separator name="codingGroup2" />
-                <separator name="typeGroup3" />
-                <separator name="scriptGroup" />
-            </menu>
-            <menu
-                label="Android"
-                path="org.eclipse.jdt.ui.refactoring.menu/androidGroup"
-                id="com.android.ide.eclipse.adt.refactoring.menu">
-                <separator name="android" />
-            </menu>
-            <action
-                class="com.android.ide.eclipse.adt.internal.refactorings.extractstring.ExtractStringAction"
-                definitionId="com.android.ide.eclipse.adt.refactoring.extract.string"
-                id="com.android.ide.eclipse.adt.actions.ExtractString"
-                label="Extract Android String..."
-                menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
-                style="push"
-                tooltip="Extracts a string into Android resource string">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ExtractIncludeAction"
-                definitionId="com.android.ide.eclipse.adt.refactoring.extract.include"
-                id="com.android.ide.eclipse.adt.actions.ExtractInclude"
-                label="Extract as Include..."
-                menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
-                style="push"
-                tooltip="Extracts Views as Included Layout">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ExtractStyleAction"
-                definitionId="com.android.ide.eclipse.adt.refactoring.extract.style"
-                id="com.android.ide.eclipse.adt.actions.ExtractStyle"
-                label="Extract Style..."
-                menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
-                style="push"
-                tooltip="Extracts Styles">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.WrapInAction"
-                definitionId="com.android.ide.eclipse.adt.refactoring.wrapin"
-                id="com.android.ide.eclipse.adt.actions.WrapIn"
-                label="Wrap In Container..."
-                menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
-                style="push"
-                tooltip="Wraps Views in a new container">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.UnwrapAction"
-                definitionId="com.android.ide.eclipse.adt.refactoring.unwrap"
-                id="com.android.ide.eclipse.adt.actions.Unwrap"
-                label="Remove Container..."
-                menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
-                style="push"
-                tooltip="Unwraps Views by Removing their container">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ChangeLayoutAction"
-                definitionId="com.android.ide.eclipse.adt.refactoring.convert"
-                id="com.android.ide.eclipse.adt.actions.ChangeLayout"
-                label="Change Layout..."
-                menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
-                style="push"
-                tooltip="Changes layouts from one type to another">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ChangeViewAction"
-                definitionId="com.android.ide.eclipse.adt.refactoring.changeview"
-                id="com.android.ide.eclipse.adt.actions.ChangeView"
-                label="Change Widget Type..."
-                menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
-                style="push"
-                tooltip="Changes the type of the selected widgets">
-            </action>
-            <menu
-                id="org.eclipse.jdt.ui.refactoring.menu"
-                label="Refactor">
-            </menu>
-        </actionSet>
-        <actionSet
-            description="Android AVD and SDK Manager"
-            id="adt.actionSet.avdManager"
-            label="Android SDK and AVD Manager"
-            visible="false">
-            <action
-                class="com.android.ide.eclipse.adt.internal.actions.AvdManagerAction"
-                icon="icons/avd_manager.png"
-                id="com.android.ide.eclipse.adt.ui.avdmanager"
-                label="Android Virtual Device Manager"
-                menubarPath="Window/additions"
-                style="push"
-                toolbarPath="android_project">
-            </action>
-            <action
-                class="com.android.ide.eclipse.adt.internal.actions.SdkManagerAction"
-                icon="icons/sdk_manager.png"
-                id="com.android.ide.eclipse.adt.ui.sdkmanager"
-                label="Android SDK Manager"
-                menubarPath="Window/additions"
-                style="push"
-                toolbarPath="android_project">
-            </action>
-        </actionSet>
-        <actionSet
-            description="Android Lint"
-            id="adt.actionSet.lint"
-            label="Android Lint"
-            visible="false">
-            <action
-                class="com.android.ide.eclipse.adt.internal.lint.RunLintAction"
-                style="pulldown"
-                icon="icons/lintrun.png"
-                id="com.android.ide.eclipse.adt.ui.lintrunner"
-                label="Run Android Lint"
-                menubarPath="Window/additions"
-                toolbarPath="android_project">
-            </action>
-        </actionSet>
-    </extension>
-    <extension point="org.eclipse.debug.core.launchDelegates">
-        <launchDelegate
-            delegate="com.android.ide.eclipse.adt.internal.launch.JUnitLaunchConfigDelegate"
-            delegateDescription="Removes the Android JAR from the Bootstrap Classpath"
-            id="com.android.ide.eclipse.adt.launch.JUnitLaunchConfigDelegate.launchAndroidJunit"
-            modes="run,debug"
-            name="Android JUnit Test"
-            type="org.eclipse.jdt.junit.launchconfig">
-        </launchDelegate>
-    </extension>
-    <extension point="org.eclipse.debug.core.launchConfigurationTypes">
-        <launchConfigurationType
-            delegate="com.android.ide.eclipse.adt.internal.launch.junit.AndroidJUnitLaunchConfigDelegate"
-            id="com.android.ide.eclipse.adt.junit.launchConfigurationType"
-            modes="run,debug"
-            name="Android JUnit Test"
-            public="true"
-            sourceLocatorId="com.android.ide.eclipse.adt.internal.sourcelookup.AdtSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-        </launchConfigurationType>
-    </extension>
-    <extension point="org.eclipse.debug.core.sourceLocators">
-        <sourceLocator
-            id="com.android.ide.eclipse.adt.internal.sourcelookup.AdtSourceLookupDirector"
-            class="com.android.ide.eclipse.adt.internal.sourcelookup.AdtSourceLookupDirector"
-            name="%sourceLocator.name">
-        </sourceLocator>
-    </extension>
-    <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-        <launchConfigurationTypeImage
-            configTypeID="com.android.ide.eclipse.adt.junit.launchConfigurationType"
-            icon="icons/androidjunit.png"
-            id="com.android.ide.eclipse.adt.junit.launchConfigurationTypeImage">
-        </launchConfigurationTypeImage>
-    </extension>
-    <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-        <launchConfigurationTabGroup
-            class="com.android.ide.eclipse.adt.internal.launch.junit.AndroidJUnitTabGroup"
-            description="Android JUnit Test"
-            id="com.android.ide.eclipse.adt.junit.AndroidJUnitLaunchConfigTabGroup"
-            type="com.android.ide.eclipse.adt.junit.launchConfigurationType" />
-    </extension>
-    <extension point="org.eclipse.debug.ui.launchShortcuts">
-        <shortcut
-            class="com.android.ide.eclipse.adt.internal.launch.junit.AndroidJUnitLaunchShortcut"
-            icon="icons/androidjunit.png"
-            id="com.android.ide.eclipse.adt.junit.launchShortcut"
-            label="Android JUnit Test"
-            modes="run,debug">
-            <contextualLaunch>
-                <enablement>
-                    <with variable="selection">
-                        <count value="1" />
-                        <iterate>
-                            <adapt type="org.eclipse.jdt.core.IJavaElement">
-                                <test
-                                    property="org.eclipse.jdt.core.isInJavaProjectWithNature"
-                                    value="com.android.ide.eclipse.adt.AndroidNature" />
-                                <test
-                                    property="org.eclipse.jdt.core.hasTypeOnClasspath"
-                                    value="junit.framework.Test" />
-                                <test property="com.android.ide.eclipse.adt.canLaunchAsJUnit" />
-                            </adapt>
-                        </iterate>
-                    </with>
-                </enablement>
-            </contextualLaunch>
-            <configurationType id="com.android.ide.eclipse.adt.junit.launchConfigurationType">
-            </configurationType>
-        </shortcut>
-    </extension>
-    <extension point="org.eclipse.ui.commands">
-        <category
-            description="Refactorings for Android Projects"
-            id="com.android.ide.eclipse.adt.refactoring.category"
-            name="Android Refactorings">
-        </category>
-        <command
-            categoryId="com.android.ide.eclipse.adt.refactoring.category"
-            description="Extract Strings into Android String Resources"
-            id="com.android.ide.eclipse.adt.refactoring.extract.string"
-            name="Extract Android String">
-        </command>
-        <command
-            categoryId="com.android.ide.eclipse.adt.refactoring.category"
-            description="Extract Views as Included Layout"
-            id="com.android.ide.eclipse.adt.refactoring.extract.include"
-            name="Extract as Include">
-        </command>
-        <command
-            categoryId="com.android.ide.eclipse.adt.refactoring.category"
-            description="Extract Styles"
-            id="com.android.ide.eclipse.adt.refactoring.extract.style"
-            name="Extract Styles">
-        </command>
-        <command
-            categoryId="com.android.ide.eclipse.adt.refactoring.category"
-            description="Wraps Views in a New Container"
-            id="com.android.ide.eclipse.adt.refactoring.wrapin"
-            name="Wrap in Container">
-        </command>
-        <command
-            categoryId="com.android.ide.eclipse.adt.refactoring.category"
-            description="Unwraps Views From Their Container"
-            id="com.android.ide.eclipse.adt.refactoring.unwrap"
-            name="Remove Container">
-        </command>
-        <command
-            categoryId="com.android.ide.eclipse.adt.refactoring.category"
-            description="Converts Layouts from One Type to Another"
-            id="com.android.ide.eclipse.adt.refactoring.convert"
-            name="Change Layout">
-        </command>
-        <command
-            categoryId="com.android.ide.eclipse.adt.refactoring.category"
-            description="Changes the widget type for the selection"
-            id="com.android.ide.eclipse.adt.refactoring.changeview"
-            name="Change Widget Type">
-        </command>
-    </extension>
-    <extension point="org.eclipse.ltk.core.refactoring.refactoringContributions">
-        <contribution
-            class="com.android.ide.eclipse.adt.internal.refactorings.extractstring.ExtractStringContribution"
-            id="com.android.ide.eclipse.adt.refactoring.extract.string">
-        </contribution>
-        <contribution
-            class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ExtractIncludeContribution"
-            id="com.android.ide.eclipse.adt.refactoring.extract.include">
-        </contribution>
-        <contribution
-            class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ExtractStyleContribution"
-            id="com.android.ide.eclipse.adt.refactoring.extract.style">
-        </contribution>
-        <contribution
-            class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.WrapInContribution"
-            id="com.android.ide.eclipse.adt.refactoring.wrapin">
-        </contribution>
-        <contribution
-            class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.UnwrapContribution"
-            id="com.android.ide.eclipse.adt.refactoring.unwrap">
-        </contribution>
-        <contribution
-            class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ChangeLayoutContribution"
-            id="com.android.ide.eclipse.adt.refactoring.convert">
-        </contribution>
-        <contribution
-            class="com.android.ide.eclipse.adt.internal.editors.layout.refactoring.ChangeViewContribution"
-            id="com.android.ide.eclipse.adt.refactoring.changeview">
-        </contribution>
-    </extension>
-    <extension point="org.eclipse.core.expressions.propertyTesters">
-        <propertyTester
-            properties="isTest,canLaunchAsJUnit"
-            namespace="com.android.ide.eclipse.adt"
-            type="org.eclipse.core.runtime.IAdaptable"
-            class="com.android.ide.eclipse.adt.internal.launch.junit.AndroidJUnitPropertyTester"
-            id="com.android.ide.eclipse.adt.AndroidJUnitPropertyTester">
-        </propertyTester>
-    </extension>
-    <extension point="com.android.ide.eclipse.ddms.toolsLocator">
-        <locator class="com.android.ide.eclipse.adt.ToolsLocator">
-        </locator>
-    </extension>
-    <extension point="com.android.ide.eclipse.ddms.debuggerConnector">
-        <connector class="com.android.ide.eclipse.adt.DebuggerConnector">
-        </connector>
-    </extension>
-    <extension point="com.android.ide.eclipse.ddms.sourceRevealer">
-        <revealer class="com.android.ide.eclipse.adt.SourceRevealer">
-        </revealer>
-    </extension>
-    <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-        <renameParticipant
-            class="com.android.ide.eclipse.adt.internal.refactorings.core.AndroidTypeRenameParticipant"
-            id="com.android.ide.eclipse.adt.internal.refactoring.core.AndroidTypeRenameParticipant"
-            name="Android Rename Type Participant">
-            <enablement>
-                <with variable="element">
-                    <instanceof value="org.eclipse.jdt.core.IType">
-                    </instanceof>
-                </with>
-                <with variable="affectedNatures">
-                    <iterate operator="or">
-                        <equals value="com.android.ide.eclipse.adt.AndroidNature" />
-                    </iterate>
-                </with>
-            </enablement>
-        </renameParticipant>
-        <renameParticipant
-            class="com.android.ide.eclipse.adt.internal.refactorings.core.RenameResourceParticipant"
-            id="com.android.ide.eclipse.adt.internal.refactorings.core.RenameResourceParticipant"
-            name="Android Rename Resource Participant">
-            <enablement>
-                <with variable="element">
-                    <or>
-                        <instanceof value="org.eclipse.jdt.core.IField"/>
-                        <instanceof value="org.eclipse.core.resources.IResource" />
-                        <instanceof value="java.lang.String" />
-                    </or>
-                </with>
-                <with variable="affectedNatures">
-                    <iterate operator="or">
-                        <equals value="com.android.ide.eclipse.adt.AndroidNature" />
-                    </iterate>
-                </with>
-            </enablement>
-        </renameParticipant>
-        <renameParticipant
-            class="com.android.ide.eclipse.adt.internal.refactorings.core.AndroidPackageRenameParticipant"
-            id="com.android.ide.eclipse.adt.internal.refactoring.core.AndroidPackageRenameParticipant"
-            name="Android Rename Package Participant">
-            <enablement>
-                <with variable="element">
-                    <instanceof value="org.eclipse.jdt.core.IPackageFragment">
-                    </instanceof>
-                </with>
-                <with variable="affectedNatures">
-                    <iterate operator="or">
-                        <equals value="com.android.ide.eclipse.adt.AndroidNature" />
-                    </iterate>
-                </with>
-            </enablement>
-        </renameParticipant>
-    </extension>
-    <extension point="org.eclipse.ltk.core.refactoring.moveParticipants">
-        <moveParticipant
-            class="com.android.ide.eclipse.adt.internal.refactorings.core.AndroidTypeMoveParticipant"
-            id="com.android.ide.eclipse.adt.internal.refactoring.core.androidTypeMoveParticipant"
-            name="Android Move Type Participant">
-            <enablement>
-                <with variable="element">
-                    <instanceof value="org.eclipse.jdt.core.IType">
-                    </instanceof>
-                </with>
-                <with variable="affectedNatures">
-                    <iterate operator="or">
-                        <equals value="com.android.ide.eclipse.adt.AndroidNature" />
-                    </iterate>
-                </with>
-            </enablement>
-        </moveParticipant>
-    </extension>
-    <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
-        <target
-            id="com.android.ide.eclipse.xmlCode"
-            name="XML Editor">
-            <context type="org.eclipse.ui.texteditor.ITextEditor" />
-        </target>
-    </extension>
-    <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
-        <hyperlinkDetector
-            class="com.android.ide.eclipse.adt.internal.editors.Hyperlinks$XmlResolver"
-            id="com.android.ide.eclipse.xmlCodeResolver"
-            name="Android XML Hyperlink Detector"
-            targetId="com.android.ide.eclipse.xmlCode">
-        </hyperlinkDetector>
-        <hyperlinkDetector
-            class="com.android.ide.eclipse.adt.internal.editors.Hyperlinks$JavaResolver"
-            id="com.android.ide.eclipse.javaCodeResolver"
-            name="Android Java Hyperlink Detector"
-            targetId="org.eclipse.jdt.ui.javaCode">
-        </hyperlinkDetector>
-      <!--
-      Register this hyperlink provider TWICE, once without any modifier keys, and
-      once with Modifier1+Modifier2. The one without (which will pick up the default
-      of M1) will typically duel with the builtin Java hyperlink resolver, so the
-      user gets a popup and must choose our resolver with the arrow key or mouse
-      action. The second registration adds a quick bypass for that.
-      -->
-        <hyperlinkDetector
-            class="com.android.ide.eclipse.adt.internal.editors.Hyperlinks$JavaResolver"
-            id="com.android.ide.eclipse.javaCodeResolver2"
-            modifierKeys="M1+M2+M3"
-            name="Android Java Hyperlink Detector (Extra Modifier Key)"
-            targetId="org.eclipse.jdt.ui.javaCode">
-        </hyperlinkDetector>
-    </extension>
-    <extension point="org.eclipse.ui.bindings">
-        <key
-            sequence="M3+M2+A S"
-            contextId="org.eclipse.ui.contexts.window"
-            commandId="com.android.ide.eclipse.adt.refactoring.extract.string"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-        <key
-            sequence="M3+M2+A D"
-            contextId="org.eclipse.ui.contexts.window"
-            commandId="com.android.ide.eclipse.adt.launch.LaunchShortcut.debug"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-        <key
-            sequence="M3+M2+A R"
-            contextId="org.eclipse.ui.contexts.window"
-            commandId="com.android.ide.eclipse.adt.launch.LaunchShortcut.run"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-     <!-- Rebind the select-enclosing actions from WTP's M2+M3 to M2+M4 to be
-          consistent with Java files. The contextId is org.eclipse.core.runtime.xml
-          instead of org.eclipse.wst.sse.ui.structuredTextEditorScope to avoid
-          keyboard conflict warnings (and an action selection dialog.)
-     -->
-        <key
-            platform="carbon"
-            sequence="CTRL+SHIFT+ARROW_UP"
-            contextId="org.eclipse.core.runtime.xml"
-            commandId="org.eclipse.wst.sse.ui.structure.select.enclosing"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-        <key
-            platform="carbon"
-            sequence="CTRL+SHIFT+ARROW_DOWN"
-            contextId="org.eclipse.core.runtime.xml"
-            commandId="org.eclipse.wst.sse.ui.structure.select.last"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-    </extension>
-    <extension point="org.eclipse.core.contenttype.contentTypes">
-        <content-type
-            describer="com.android.ide.eclipse.adt.internal.editors.binaryxml.BinaryXMLDescriber"
-            file-extensions="xml"
-            id="com.android.ide.eclipse.adt.binaryXml"
-            name="Android Binary XML"
-            priority="high">
-        </content-type>
-    </extension>
-    <extension point="org.eclipse.ui.startup">
-        <startup class="com.android.ide.eclipse.adt.internal.welcome.AdtStartup"/>
-    </extension>
-
-    <!-- workaround for bug 15003. -->
-    <extension
-        point="org.eclipse.core.filebuffers.documentCreation"
-        id="binaryXmlfactories"
-        name="Binary XML Document Factory Extension">
-        <factory
-            contentTypeId="com.android.ide.eclipse.adt.binaryXml"
-            class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
-    </extension>
-</plugin>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml
deleted file mode 100644
index a0257be..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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.3.3-SNAPSHOT</version>
-    <artifactId>com.android.ide.eclipse.adt</artifactId>
-    <packaging>eclipse-plugin</packaging>
-    <name>adt</name>
-
-    <parent>
-        <relativePath>../../pom.xml</relativePath>
-        <groupId>adt.group</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-</project>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsListViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsListViewRule.java
deleted file mode 100644
index cd1b0fc..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsListViewRule.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ide.common.layout;
-
-import com.android.ide.common.api.IViewRule;
-
-/**
- * An {@link IViewRule} for android.widget.AbsListViewRule
- */
-public class AbsListViewRule extends IgnoredLayoutRule {
-
-    // GridViews and ListViews are not configurable via XML
-
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java
deleted file mode 100644
index 3ec3b5f..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ide.common.layout;
-
-import static com.android.SdkConstants.ANDROID_URI;
-import static com.android.SdkConstants.ATTR_LAYOUT_X;
-import static com.android.SdkConstants.ATTR_LAYOUT_Y;
-import static com.android.SdkConstants.VALUE_N_DP;
-
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
-import com.android.ide.common.api.DrawingStyle;
-import com.android.ide.common.api.DropFeedback;
-import com.android.ide.common.api.IDragElement;
-import com.android.ide.common.api.IFeedbackPainter;
-import com.android.ide.common.api.IGraphics;
-import com.android.ide.common.api.INode;
-import com.android.ide.common.api.INodeHandler;
-import com.android.ide.common.api.IViewRule;
-import com.android.ide.common.api.Point;
-import com.android.ide.common.api.Rect;
-import com.android.ide.common.api.SegmentType;
-import com.android.utils.Pair;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * An {@link IViewRule} for android.widget.AbsoluteLayout and all its derived
- * classes.
- */
-public class AbsoluteLayoutRule extends BaseLayoutRule {
-
-    @Override
-    public List<String> getSelectionHint(@NonNull INode parentNode, @NonNull INode childNode) {
-        List<String> infos = new ArrayList<String>(2);
-        infos.add("AbsoluteLayout is deprecated.");
-        infos.add("Use other layouts instead.");
-        return infos;
-    }
-
-    // ==== Drag'n'drop support ====
-    // The AbsoluteLayout accepts any drag'n'drop anywhere on its surface.
-
-    @Override
-    public DropFeedback onDropEnter(@NonNull INode targetNode, @Nullable Object targetView,
-            final @Nullable IDragElement[] elements) {
-
-        if (elements.length == 0) {
-            return null;
-        }
-
-        DropFeedback df = new DropFeedback(null, new IFeedbackPainter() {
-            @Override
-            public void paint(@NonNull IGraphics gc, @NonNull INode node,
-                    @NonNull DropFeedback feedback) {
-                // Paint callback for the AbsoluteLayout.
-                // This is called by the canvas when a draw is needed.
-                drawFeedback(gc, node, elements, feedback);
-            }
-        });
-        df.errorMessage = "AbsoluteLayout is deprecated.";
-        return df;
-    }
-
-    void drawFeedback(
-            IGraphics gc,
-            INode targetNode,
-            IDragElement[] elements,
-            DropFeedback feedback) {
-        Rect b = targetNode.getBounds();
-        if (!b.isValid()) {
-            return;
-        }
-
-        // Highlight the receiver
-        gc.useStyle(DrawingStyle.DROP_RECIPIENT);
-        gc.drawRect(b);
-
-        // Get the drop point
-        Point p = (Point) feedback.userData;
-
-        if (p == null) {
-            return;
-        }
-
-        int x = p.x;
-        int y = p.y;
-
-        Rect be = elements[0].getBounds();
-
-        if (be.isValid()) {
-            // At least the first element has a bound. Draw rectangles
-            // for all dropped elements with valid bounds, offset at
-            // the drop point.
-            int offsetX = x - be.x + (feedback.dragBounds != null ? feedback.dragBounds.x : 0);
-            int offsetY = y - be.y + (feedback.dragBounds != null ? feedback.dragBounds.y : 0);
-            gc.useStyle(DrawingStyle.DROP_PREVIEW);
-            for (IDragElement element : elements) {
-                drawElement(gc, element, offsetX, offsetY);
-            }
-        } else {
-            // We don't have bounds for new elements. In this case
-            // just draw cross hairs to the drop point.
-            gc.useStyle(DrawingStyle.GUIDELINE);
-            gc.drawLine(x, b.y, x, b.y + b.h);
-            gc.drawLine(b.x, y, b.x + b.w, y);
-
-            // Use preview lines to indicate the bottom quadrant as well (to
-            // indicate that you are looking at the top left position of the
-            // drop, not the center for example)
-            gc.useStyle(DrawingStyle.DROP_PREVIEW);
-            gc.drawLine(x, y, b.x + b.w, y);
-            gc.drawLine(x, y, x, b.y + b.h);
-        }
-    }
-
-    @Override
-    public DropFeedback onDropMove(@NonNull INode targetNode, @NonNull IDragElement[] elements,
-            @Nullable DropFeedback feedback, @NonNull Point p) {
-        // Update the data used by the DropFeedback.paintCallback above.
-        feedback.userData = p;
-        feedback.requestPaint = true;
-
-        return feedback;
-    }
-
-    @Override
-    public void onDropLeave(@NonNull INode targetNode, @NonNull IDragElement[] elements,
-            @Nullable DropFeedback feedback) {
-        // Nothing to do.
-    }
-
-    @Override
-    public void onDropped(final @NonNull INode targetNode, final @NonNull IDragElement[] elements,
-            final @Nullable DropFeedback feedback, final @NonNull Point p) {
-
-        final Rect b = targetNode.getBounds();
-        if (!b.isValid()) {
-            return;
-        }
-
-        // Collect IDs from dropped elements and remap them to new IDs
-        // if this is a copy or from a different canvas.
-        final Map<String, Pair<String, String>> idMap = getDropIdMap(targetNode, elements,
-                feedback.isCopy || !feedback.sameCanvas);
-
-        targetNode.editXml("Add elements to AbsoluteLayout", new INodeHandler() {
-            @Override
-            public void handle(@NonNull INode node) {
-                boolean first = true;
-                Point offset = null;
-
-                // Now write the new elements.
-                for (IDragElement element : elements) {
-                    String fqcn = element.getFqcn();
-                    Rect be = element.getBounds();
-
-                    INode newChild = targetNode.appendChild(fqcn);
-
-                    // Copy all the attributes, modifying them as needed.
-                    addAttributes(newChild, element, idMap, DEFAULT_ATTR_FILTER);
-
-                    int deltaX = (feedback.dragBounds != null ? feedback.dragBounds.x : 0);
-                    int deltaY = (feedback.dragBounds != null ? feedback.dragBounds.y : 0);
-
-                    int x = p.x - b.x + deltaX;
-                    int y = p.y - b.y + deltaY;
-
-                    if (first) {
-                        first = false;
-                        if (be.isValid()) {
-                            offset = new Point(x - be.x, y - be.y);
-                        }
-                    } else if (offset != null && be.isValid()) {
-                        x = offset.x + be.x;
-                        y = offset.y + be.y;
-                    } else {
-                        x += 10;
-                        y += be.isValid() ? be.h : 10;
-                    }
-
-                    double scale = feedback.dipScale;
-                    if (scale != 1.0) {
-                        x *= scale;
-                        y *= scale;
-                    }
-
-                    newChild.setAttribute(ANDROID_URI, ATTR_LAYOUT_X,
-                            String.format(VALUE_N_DP, x));
-                    newChild.setAttribute(ANDROID_URI, ATTR_LAYOUT_Y,
-                            String.format(VALUE_N_DP, y));
-
-                    addInnerElements(newChild, element, idMap);
-                }
-            }
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p>
-     * Overridden in this layout in order to let the top left coordinate be affected by
-     * the resize operation too. In other words, dragging the top left corner to resize a
-     * widget will not only change the size of the widget, it will also move it (though in
-     * this case, the bottom right corner will stay fixed).
-     */
-    @Override
-    protected void setNewSizeBounds(ResizeState resizeState, INode node, INode layout,
-            Rect previousBounds, Rect newBounds, SegmentType horizontalEdge,
-            SegmentType verticalEdge) {
-        super.setNewSizeBounds(resizeState, node, layout, previousBounds, newBounds,
-                horizontalEdge, verticalEdge);
-        if (verticalEdge != null && newBounds.x != previousBounds.x) {
-            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_X,
-                    String.format(VALUE_N_DP,
-                            mRulesEngine.pxToDp(newBounds.x - node.getParent().getBounds().x)));
-        }
-        if (horizontalEdge != null && newBounds.y != previousBounds.y) {
-            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_Y,
-                    String.format(VALUE_N_DP,
-                            mRulesEngine.pxToDp(newBounds.y - node.getParent().getBounds().y)));
-        }
-    }
-
-    @Override
-    protected String getResizeUpdateMessage(ResizeState resizeState, INode child, INode parent,
-            Rect newBounds, SegmentType horizontalEdge, SegmentType verticalEdge) {
-        Rect parentBounds = parent.getBounds();
-        if (horizontalEdge == SegmentType.BOTTOM && verticalEdge == SegmentType.RIGHT) {
-            return super.getResizeUpdateMessage(resizeState, child, parent, newBounds,
-                    horizontalEdge, verticalEdge);
-        }
-        return String.format("x=%d, y=%d\nwidth=%s, height=%s",
-                mRulesEngine.pxToDp(newBounds.x - parentBounds.x),
-                mRulesEngine.pxToDp(newBounds.y - parentBounds.y),
-                resizeState.getWidthAttribute(), resizeState.getHeightAttribute());
-    }
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AdapterViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AdapterViewRule.java
deleted file mode 100644
index 28f5fc9..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AdapterViewRule.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.ide.common.layout;
-
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
-import com.android.ide.common.api.DrawingStyle;
-import com.android.ide.common.api.DropFeedback;
-import com.android.ide.common.api.IDragElement;
-import com.android.ide.common.api.IFeedbackPainter;
-import com.android.ide.common.api.IGraphics;
-import com.android.ide.common.api.INode;
-import com.android.ide.common.api.Point;
-import com.android.ide.common.api.Rect;
-
-/** Rule for AdapterView subclasses that don't have more specific rules */
-public class AdapterViewRule extends BaseLayoutRule {
-    @Override
-    public DropFeedback onDropEnter(@NonNull INode targetNode, @Nullable Object targetView,
-            @Nullable IDragElement[] elements) {
-        // You are not allowed to insert children into AdapterViews; you must
-        // use the dedicated addView methods etc dynamically
-        DropFeedback dropFeedback = new DropFeedback(null,  new IFeedbackPainter() {
-            @Override
-            public void paint(@NonNull IGraphics gc, @NonNull INode node,
-                    @NonNull DropFeedback feedback) {
-                Rect b = node.getBounds();
-                if (b.isValid()) {
-                    gc.useStyle(DrawingStyle.DROP_RECIPIENT);
-                    gc.drawRect(b);
-                }
-            }
-        });
-        String fqcn = targetNode.getFqcn();
-        String name = fqcn.substring(fqcn.lastIndexOf('.') +1);
-        dropFeedback.errorMessage = String.format(
-                "%s cannot be configured via XML; add content to the AdapterView using Java code",
-                name);
-        dropFeedback.invalidTarget = true;
-        return dropFeedback;
-    }
-
-    @Override
-    public DropFeedback onDropMove(@NonNull INode targetNode, @NonNull IDragElement[] elements,
-            @Nullable DropFeedback feedback, @NonNull Point p) {
-        feedback.invalidTarget = true;
-        return feedback;
-    }
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseLayoutRule.java
deleted file mode 100644
index df2c8f4..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseLayoutRule.java
+++ /dev/null
@@ -1,878 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ide.common.layout;
-
-import static com.android.SdkConstants.ANDROID_URI;
-import static com.android.SdkConstants.ATTR_ID;
-import static com.android.SdkConstants.ATTR_LAYOUT_ABOVE;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP;
-import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING;
-import static com.android.SdkConstants.ATTR_LAYOUT_BELOW;
-import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_HORIZONTAL;
-import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_IN_PARENT;
-import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_VERTICAL;
-import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN;
-import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN;
-import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY;
-import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT;
-import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN;
-import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_BOTTOM;
-import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_LEFT;
-import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_RIGHT;
-import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_TOP;
-import static com.android.SdkConstants.ATTR_LAYOUT_ROW;
-import static com.android.SdkConstants.ATTR_LAYOUT_ROW_SPAN;
-import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF;
-import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF;
-import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH;
-import static com.android.SdkConstants.ATTR_LAYOUT_X;
-import static com.android.SdkConstants.ATTR_LAYOUT_Y;
-import static com.android.SdkConstants.VALUE_FILL_PARENT;
-import static com.android.SdkConstants.VALUE_MATCH_PARENT;
-import static com.android.SdkConstants.VALUE_WRAP_CONTENT;
-
-import com.android.SdkConstants;
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
-import com.android.ide.common.api.DrawingStyle;
-import com.android.ide.common.api.DropFeedback;
-import com.android.ide.common.api.IAttributeInfo;
-import com.android.ide.common.api.IClientRulesEngine;
-import com.android.ide.common.api.IDragElement;
-import com.android.ide.common.api.IDragElement.IDragAttribute;
-import com.android.ide.common.api.IFeedbackPainter;
-import com.android.ide.common.api.IGraphics;
-import com.android.ide.common.api.IMenuCallback;
-import com.android.ide.common.api.INode;
-import com.android.ide.common.api.INodeHandler;
-import com.android.ide.common.api.IViewRule;
-import com.android.ide.common.api.MarginType;
-import com.android.ide.common.api.Point;
-import com.android.ide.common.api.Rect;
-import com.android.ide.common.api.RuleAction;
-import com.android.ide.common.api.RuleAction.ChoiceProvider;
-import com.android.ide.common.api.Segment;
-import com.android.ide.common.api.SegmentType;
-import com.android.utils.Pair;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A {@link IViewRule} for all layouts.
- */
-public class BaseLayoutRule extends BaseViewRule {
-    private static final String ACTION_FILL_WIDTH = "_fillW";  //$NON-NLS-1$
-    private static final String ACTION_FILL_HEIGHT = "_fillH"; //$NON-NLS-1$
-    private static final String ACTION_MARGIN = "_margin";     //$NON-NLS-1$
-    private static final URL ICON_MARGINS =
-        BaseLayoutRule.class.getResource("margins.png"); //$NON-NLS-1$
-    private static final URL ICON_GRAVITY =
-        BaseLayoutRule.class.getResource("gravity.png"); //$NON-NLS-1$
-    private static final URL ICON_FILL_WIDTH =
-        BaseLayoutRule.class.getResource("fillwidth.png"); //$NON-NLS-1$
-    private static final URL ICON_FILL_HEIGHT =
-        BaseLayoutRule.class.getResource("fillheight.png"); //$NON-NLS-1$
-
-    // ==== Layout Actions support ====
-
-    // The Margin layout parameters are available for LinearLayout, FrameLayout, RelativeLayout,
-    // and their subclasses.
-    protected final RuleAction createMarginAction(final INode parentNode,
-            final List<? extends INode> children) {
-
-        final List<? extends INode> targets = children == null || children.size() == 0 ?
-                Collections.singletonList(parentNode)
-                : children;
-        final INode first = targets.get(0);
-
-        IMenuCallback actionCallback = new IMenuCallback() {
-            @Override
-            public void action(@NonNull RuleAction action,
-                    @NonNull List<? extends INode> selectedNodes,
-                    final @Nullable String valueId,
-                    final @Nullable Boolean newValue) {
-                parentNode.editXml("Change Margins", new INodeHandler() {
-                    @Override
-                    public void handle(@NonNull INode n) {
-                        String uri = ANDROID_URI;
-                        String all = first.getStringAttr(uri, ATTR_LAYOUT_MARGIN);
-                        String left = first.getStringAttr(uri, ATTR_LAYOUT_MARGIN_LEFT);
-                        String right = first.getStringAttr(uri, ATTR_LAYOUT_MARGIN_RIGHT);
-                        String top = first.getStringAttr(uri, ATTR_LAYOUT_MARGIN_TOP);
-                        String bottom = first.getStringAttr(uri, ATTR_LAYOUT_MARGIN_BOTTOM);
-                        String[] margins = mRulesEngine.displayMarginInput(all, left,
-                                right, top, bottom);
-                        if (margins != null) {
-                            assert margins.length == 5;
-                            for (INode child : targets) {
-                                child.setAttribute(uri, ATTR_LAYOUT_MARGIN, margins[0]);
-                                child.setAttribute(uri, ATTR_LAYOUT_MARGIN_LEFT, margins[1]);
-                                child.setAttribute(uri, ATTR_LAYOUT_MARGIN_RIGHT, margins[2]);
-                                child.setAttribute(uri, ATTR_LAYOUT_MARGIN_TOP, margins[3]);
-                                child.setAttribute(uri, ATTR_LAYOUT_MARGIN_BOTTOM, margins[4]);
-                            }
-                        }
-                    }
-                });
-            }
-        };
-
-        return RuleAction.createAction(ACTION_MARGIN, "Change Margins...", actionCallback,
-                ICON_MARGINS, 40, false);
-    }
-
-    // Both LinearLayout and RelativeLayout have a gravity (but RelativeLayout applies it
-    // to the parent whereas for LinearLayout it's on the children)
-    protected final RuleAction createGravityAction(final List<? extends INode> targets, final
-            String attributeName) {
-        if (targets != null && targets.size() > 0) {
-            final INode first = targets.get(0);
-            ChoiceProvider provider = new ChoiceProvider() {
-                @Override
-                public void addChoices(@NonNull List<String> titles, @NonNull List<URL> iconUrls,
-                        @NonNull List<String> ids) {
-                    IAttributeInfo info = first.getAttributeInfo(ANDROID_URI, attributeName);
-                    if (info != null) {
-                        // Generate list of possible gravity value constants
-                        assert info.getFormats().contains(IAttributeInfo.Format.FLAG);
-                        for (String name : info.getFlagValues()) {
-                            titles.add(getAttributeDisplayName(name));
-                            ids.add(name);
-                        }
-                    }
-                }
-            };
-
-            return RuleAction.createChoices("_gravity", "Change Gravity", //$NON-NLS-1$
-                    new PropertyCallback(targets, "Change Gravity", ANDROID_URI,
-                            attributeName),
-                    provider,
-                    first.getStringAttr(ANDROID_URI, attributeName), ICON_GRAVITY,
-                    43, false);
-        }
-
-        return null;
-    }
-
-    @Override
-    public void addLayoutActions(
-            @NonNull List<RuleAction> actions,
-            final @NonNull INode parentNode,
-            final @NonNull List<? extends INode> children) {
-        super.addLayoutActions(actions, parentNode, children);
-
-        final List<? extends INode> targets = children == null || children.size() == 0 ?
-                Collections.singletonList(parentNode)
-                : children;
-        final INode first = targets.get(0);
-
-        // Shared action callback
-        IMenuCallback actionCallback = new IMenuCallback() {
-            @Override
-            public void action(
-                    @NonNull RuleAction action,
-                    @NonNull List<? extends INode> selectedNodes,
-                    final @Nullable String valueId,
-                    final @Nullable Boolean newValue) {
-                final String actionId = action.getId();
-                final String undoLabel;
-                if (actionId.equals(ACTION_FILL_WIDTH)) {
-                    undoLabel = "Change Width Fill";
-                } else if (actionId.equals(ACTION_FILL_HEIGHT)) {
-                    undoLabel = "Change Height Fill";
-                } else {
-                    return;
-                }
-                parentNode.editXml(undoLabel, new INodeHandler() {
-                    @Override
-                    public void handle(@NonNull INode n) {
-                        String attribute = actionId.equals(ACTION_FILL_WIDTH)
-                                ? ATTR_LAYOUT_WIDTH : ATTR_LAYOUT_HEIGHT;
-                        String value;
-                        if (newValue) {
-                            if (supportsMatchParent()) {
-                                value = VALUE_MATCH_PARENT;
-                            } else {
-                                value = VALUE_FILL_PARENT;
-                            }
-                        } else {
-                            value = VALUE_WRAP_CONTENT;
-                        }
-                        for (INode child : targets) {
-                            child.setAttribute(ANDROID_URI, attribute, value);
-                        }
-                    }
-                });
-            }
-        };
-
-        actions.add(RuleAction.createToggle(ACTION_FILL_WIDTH, "Toggle Fill Width",
-                isFilled(first, ATTR_LAYOUT_WIDTH), actionCallback, ICON_FILL_WIDTH, 10, false));
-        actions.add(RuleAction.createToggle(ACTION_FILL_HEIGHT, "Toggle Fill Height",
-                isFilled(first, ATTR_LAYOUT_HEIGHT), actionCallback, ICON_FILL_HEIGHT, 20, false));
-    }
-
-    // ==== Paste support ====
-
-    /**
-     * The default behavior for pasting in a layout is to simulate a drop in the
-     * top-left corner of the view.
-     * <p/>
-     * Note that we explicitly do not call super() here -- the BaseViewRule.onPaste handler
-     * will call onPasteBeforeChild() instead.
-     * <p/>
-     * Derived layouts should override this behavior if not appropriate.
-     */
-    @Override
-    public void onPaste(@NonNull INode targetNode, @Nullable Object targetView,
-            @NonNull IDragElement[] elements) {
-        DropFeedback feedback = onDropEnter(targetNode, targetView, elements);
-        if (feedback != null) {
-            Point p = targetNode.getBounds().getTopLeft();
-            feedback = onDropMove(targetNode, elements, feedback, p);
-            if (feedback != null) {
-                onDropLeave(targetNode, elements, feedback);
-                onDropped(targetNode, elements, feedback, p);
-            }
-        }
-    }
-
-    /**
-     * The default behavior for pasting in a layout with a specific child target
-     * is to simulate a drop right above the top left of the given child target.
-     * <p/>
-     * This method is invoked by BaseView when onPaste() is called --
-     * views don't generally accept children and instead use the target node as
-     * a hint to paste "before" it.
-     *
-     * @param parentNode the parent node we're pasting into
-     * @param parentView the view object for the parent layout, or null
-     * @param targetNode the first selected node
-     * @param elements the elements being pasted
-     */
-    public void onPasteBeforeChild(INode parentNode, Object parentView, INode targetNode,
-            IDragElement[] elements) {
-        DropFeedback feedback = onDropEnter(parentNode, parentView, elements);
-        if (feedback != null) {
-            Point parentP = parentNode.getBounds().getTopLeft();
-            Point targetP = targetNode.getBounds().getTopLeft();
-            if (parentP.y < targetP.y) {
-                targetP.y -= 1;
-            }
-
-            feedback = onDropMove(parentNode, elements, feedback, targetP);
-            if (feedback != null) {
-                onDropLeave(parentNode, elements, feedback);
-                onDropped(parentNode, elements, feedback, targetP);
-            }
-        }
-    }
-
-    // ==== Utility methods used by derived layouts ====
-
-    /**
-     * Draws the bounds of the given elements and all its children elements in the canvas
-     * with the specified offset.
-     *
-     * @param gc the graphics context
-     * @param element the element to be drawn
-     * @param offsetX a horizontal delta to add to the current bounds of the element when
-     *            drawing it
-     * @param offsetY a vertical delta to add to the current bounds of the element when
-     *            drawing it
-     */
-    public void drawElement(IGraphics gc, IDragElement element, int offsetX, int offsetY) {
-        Rect b = element.getBounds();
-        if (b.isValid()) {
-            gc.drawRect(b.x + offsetX, b.y + offsetY, b.x + offsetX + b.w, b.y + offsetY + b.h);
-        }
-
-        for (IDragElement inner : element.getInnerElements()) {
-            drawElement(gc, inner, offsetX, offsetY);
-        }
-    }
-
-    /**
-     * Collect all the "android:id" IDs from the dropped elements. When moving
-     * objects within the same canvas, that's all there is to do. However if the
-     * objects are moved to a different canvas or are copied then set
-     * createNewIds to true to find the existing IDs under targetNode and create
-     * a map with new non-conflicting unique IDs as needed. Returns a map String
-     * old-id => tuple (String new-id, String fqcn) where fqcn is the FQCN of
-     * the element.
-     */
-    protected static Map<String, Pair<String, String>> getDropIdMap(INode targetNode,
-            IDragElement[] elements, boolean createNewIds) {
-        Map<String, Pair<String, String>> idMap = new HashMap<String, Pair<String, String>>();
-
-        if (createNewIds) {
-            collectIds(idMap, elements);
-            // Need to remap ids if necessary
-            idMap = remapIds(targetNode, idMap);
-        }
-
-        return idMap;
-    }
-
-    /**
-     * Fills idMap with a map String id => tuple (String id, String fqcn) where
-     * fqcn is the FQCN of the element (in case we want to generate new IDs
-     * based on the element type.)
-     *
-     * @see #getDropIdMap
-     */
-    protected static Map<String, Pair<String, String>> collectIds(
-            Map<String, Pair<String, String>> idMap,
-            IDragElement[] elements) {
-        for (IDragElement element : elements) {
-            IDragAttribute attr = element.getAttribute(ANDROID_URI, ATTR_ID);
-            if (attr != null) {
-                String id = attr.getValue();
-                if (id != null && id.length() > 0) {
-                    idMap.put(id, Pair.of(id, element.getFqcn()));
-                }
-            }
-
-            collectIds(idMap, element.getInnerElements());
-        }
-
-        return idMap;
-    }
-
-    /**
-     * Used by #getDropIdMap to find new IDs in case of conflict.
-     */
-    protected static Map<String, Pair<String, String>> remapIds(INode node,
-            Map<String, Pair<String, String>> idMap) {
-        // Visit the document to get a list of existing ids
-        Set<String> existingIdSet = new HashSet<String>();
-        collectExistingIds(node.getRoot(), existingIdSet);
-
-        Map<String, Pair<String, String>> new_map = new HashMap<String, Pair<String, String>>();
-        for (Map.Entry<String, Pair<String, String>> entry : idMap.entrySet()) {
-            String key = entry.getKey();
-            Pair<String, String> value = entry.getValue();
-
-            String id = normalizeId(key);
-
-            if (!existingIdSet.contains(id)) {
-                // Not a conflict. Use as-is.
-                new_map.put(key, value);
-                if (!key.equals(id)) {
-                    new_map.put(id, value);
-                }
-            } else {
-                // There is a conflict. Get a new id.
-                String new_id = findNewId(value.getSecond(), existingIdSet);
-                value = Pair.of(new_id, value.getSecond());
-                new_map.put(id, value);
-                new_map.put(id.replaceFirst("@\\+", "@"), value); //$NON-NLS-1$ //$NON-NLS-2$
-            }
-        }
-
-        return new_map;
-    }
-
-    /**
-     * Used by #remapIds to find a new ID for a conflicting element.
-     */
-    protected static String findNewId(String fqcn, Set<String> existingIdSet) {
-        // Get the last component of the FQCN (e.g. "android.view.Button" =>
-        // "Button")
-        String name = fqcn.substring(fqcn.lastIndexOf('.') + 1);
-
-        for (int i = 1; i < 1000000; i++) {
-            String id = String.format("@+id/%s%02d", name, i); //$NON-NLS-1$
-            if (!existingIdSet.contains(id)) {
-                existingIdSet.add(id);
-                return id;
-            }
-        }
-
-        // We'll never reach here.
-        return null;
-    }
-
-    /**
-     * Used by #getDropIdMap to find existing IDs recursively.
-     */
-    protected static void collectExistingIds(INode root, Set<String> existingIdSet) {
-        if (root == null) {
-            return;
-        }
-
-        String id = root.getStringAttr(ANDROID_URI, ATTR_ID);
-        if (id != null) {
-            id = normalizeId(id);
-
-            if (!existingIdSet.contains(id)) {
-                existingIdSet.add(id);
-            }
-        }
-
-        for (INode child : root.getChildren()) {
-            collectExistingIds(child, existingIdSet);
-        }
-    }
-
-    /**
-     * Transforms @id/name into @+id/name to treat both forms the same way.
-     */
-    protected static String normalizeId(String id) {
-        if (id.indexOf("@+") == -1) { //$NON-NLS-1$
-            id = id.replaceFirst("@", "@+"); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        return id;
-    }
-
-    /**
-     * For use by {@link BaseLayoutRule#addAttributes} A filter should return a
-     * valid replacement string.
-     */
-    protected static interface AttributeFilter {
-        String replace(String attributeUri, String attributeName, String attributeValue);
-    }
-
-    private static final String[] EXCLUDED_ATTRIBUTES = new String[] {
-        // Common
-        ATTR_LAYOUT_GRAVITY,
-
-        // from AbsoluteLayout
-        ATTR_LAYOUT_X,
-        ATTR_LAYOUT_Y,
-
-        // from RelativeLayout
-        ATTR_LAYOUT_ABOVE,
-        ATTR_LAYOUT_BELOW,
-        ATTR_LAYOUT_TO_LEFT_OF,
-        ATTR_LAYOUT_TO_RIGHT_OF,
-        ATTR_LAYOUT_ALIGN_BASELINE,
-        ATTR_LAYOUT_ALIGN_TOP,
-        ATTR_LAYOUT_ALIGN_BOTTOM,
-        ATTR_LAYOUT_ALIGN_LEFT,
-        ATTR_LAYOUT_ALIGN_RIGHT,
-        ATTR_LAYOUT_ALIGN_PARENT_TOP,
-        ATTR_LAYOUT_ALIGN_PARENT_BOTTOM,
-        ATTR_LAYOUT_ALIGN_PARENT_LEFT,
-        ATTR_LAYOUT_ALIGN_PARENT_RIGHT,
-        ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING,
-        ATTR_LAYOUT_CENTER_HORIZONTAL,
-        ATTR_LAYOUT_CENTER_IN_PARENT,
-        ATTR_LAYOUT_CENTER_VERTICAL,
-
-        // From GridLayout
-        ATTR_LAYOUT_ROW,
-        ATTR_LAYOUT_ROW_SPAN,
-        ATTR_LAYOUT_COLUMN,
-        ATTR_LAYOUT_COLUMN_SPAN
-    };
-
-    /**
-     * Default attribute filter used by the various layouts to filter out some properties
-     * we don't want to offer.
-     */
-    public static final AttributeFilter DEFAULT_ATTR_FILTER = new AttributeFilter() {
-        Set<String> mExcludes;
-
-        @Override
-        public String replace(String uri, String name, String value) {
-            if (!ANDROID_URI.equals(uri)) {
-                return value;
-            }
-
-            if (mExcludes == null) {
-                mExcludes = new HashSet<String>(EXCLUDED_ATTRIBUTES.length);
-                mExcludes.addAll(Arrays.asList(EXCLUDED_ATTRIBUTES));
-            }
-
-            return mExcludes.contains(name) ? null : value;
-        }
-    };
-
-    /**
-     * Copies all the attributes from oldElement to newNode. Uses the idMap to
-     * transform the value of all attributes of Format.REFERENCE. If filter is
-     * non-null, it's a filter that can rewrite the attribute string.
-     */
-    protected static void addAttributes(INode newNode, IDragElement oldElement,
-            Map<String, Pair<String, String>> idMap, AttributeFilter filter) {
-
-        for (IDragAttribute attr : oldElement.getAttributes()) {
-            String uri = attr.getUri();
-            String name = attr.getName();
-            String value = attr.getValue();
-
-            IAttributeInfo attrInfo = newNode.getAttributeInfo(uri, name);
-            if (attrInfo != null) {
-                if (attrInfo.getFormats().contains(IAttributeInfo.Format.REFERENCE)) {
-                    if (idMap.containsKey(value)) {
-                        value = idMap.get(value).getFirst();
-                    }
-                }
-            }
-
-            if (filter != null) {
-                value = filter.replace(uri, name, value);
-            }
-            if (value != null && value.length() > 0) {
-                newNode.setAttribute(uri, name, value);
-            }
-        }
-    }
-
-    /**
-     * Adds all the children elements of oldElement to newNode, recursively.
-     * Attributes are adjusted by calling addAttributes with idMap as necessary,
-     * with no closure filter.
-     */
-    protected static void addInnerElements(INode newNode, IDragElement oldElement,
-            Map<String, Pair<String, String>> idMap) {
-
-        for (IDragElement element : oldElement.getInnerElements()) {
-            String fqcn = element.getFqcn();
-            INode childNode = newNode.appendChild(fqcn);
-
-            addAttributes(childNode, element, idMap, null /* filter */);
-            addInnerElements(childNode, element, idMap);
-        }
-    }
-
-    /**
-     * Insert the given elements into the given node at the given position
-     *
-     * @param targetNode the node to insert into
-     * @param elements the elements to insert
-     * @param createNewIds if true, generate new ids when there is a conflict
-     * @param initialInsertPos index among targetnode's children which to insert the
-     *            children
-     */
-    public static void insertAt(final INode targetNode, final IDragElement[] elements,
-            final boolean createNewIds, final int initialInsertPos) {
-
-        // Collect IDs from dropped elements and remap them to new IDs
-        // if this is a copy or from a different canvas.
-        final Map<String, Pair<String, String>> idMap = getDropIdMap(targetNode, elements,
-                createNewIds);
-
-        targetNode.editXml("Insert Elements", new INodeHandler() {
-
-            @Override
-            public void handle(@NonNull INode node) {
-                // Now write the new elements.
-                int insertPos = initialInsertPos;
-                for (IDragElement element : elements) {
-                    String fqcn = element.getFqcn();
-
-                    INode newChild = targetNode.insertChildAt(fqcn, insertPos);
-
-                    // insertPos==-1 means to insert at the end. Otherwise
-                    // increment the insertion position.
-                    if (insertPos >= 0) {
-                        insertPos++;
-                    }
-
-                    // Copy all the attributes, modifying them as needed.
-                    addAttributes(newChild, element, idMap, DEFAULT_ATTR_FILTER);
-                    addInnerElements(newChild, element, idMap);
-                }
-            }
-        });
-    }
-
-    // ---- Resizing ----
-
-    /** Creates a new {@link ResizeState} object to track resize state */
-    protected ResizeState createResizeState(INode layout, Object layoutView, INode node) {
-        return new ResizeState(this, layout, layoutView, node);
-    }
-
-    @Override
-    public DropFeedback onResizeBegin(@NonNull INode child, @NonNull INode parent,
-            @Nullable SegmentType horizontalEdge, @Nullable SegmentType verticalEdge,
-            @Nullable Object childView, @Nullable Object parentView) {
-        ResizeState state = createResizeState(parent, parentView, child);
-        state.horizontalEdgeType = horizontalEdge;
-        state.verticalEdgeType = verticalEdge;
-
-        // Compute preferred (wrap_content) size such that we can offer guidelines to
-        // snap to the preferred size
-        Map<INode, Rect> sizes = mRulesEngine.measureChildren(parent,
-                new IClientRulesEngine.AttributeFilter() {
-                    @Override
-                    public String getAttribute(@NonNull INode node, @Nullable String namespace,
-                            @NonNull String localName) {
-                        // Change attributes to wrap_content
-                        if (ATTR_LAYOUT_WIDTH.equals(localName)
-                                && SdkConstants.NS_RESOURCES.equals(namespace)) {
-                            return VALUE_WRAP_CONTENT;
-                        }
-                        if (ATTR_LAYOUT_HEIGHT.equals(localName)
-                                && SdkConstants.NS_RESOURCES.equals(namespace)) {
-                            return VALUE_WRAP_CONTENT;
-                        }
-
-                        return null;
-                    }
-                });
-        if (sizes != null) {
-            state.wrapBounds = sizes.get(child);
-        }
-
-        return new DropFeedback(state, new IFeedbackPainter() {
-            @Override
-            public void paint(@NonNull IGraphics gc, @NonNull INode node,
-                    @NonNull DropFeedback feedback) {
-                ResizeState resizeState = (ResizeState) feedback.userData;
-                if (resizeState != null && resizeState.bounds != null) {
-                    paintResizeFeedback(gc, node, resizeState);
-                }
-            }
-        });
-    }
-
-    protected void paintResizeFeedback(IGraphics gc, INode node, ResizeState resizeState) {
-        gc.useStyle(DrawingStyle.RESIZE_PREVIEW);
-        Rect b = resizeState.bounds;
-        gc.drawRect(b);
-
-        if (resizeState.horizontalFillSegment != null) {
-            gc.useStyle(DrawingStyle.GUIDELINE);
-            Segment s = resizeState.horizontalFillSegment;
-            gc.drawLine(s.from, s.at, s.to, s.at);
-        }
-        if (resizeState.verticalFillSegment != null) {
-            gc.useStyle(DrawingStyle.GUIDELINE);
-            Segment s = resizeState.verticalFillSegment;
-            gc.drawLine(s.at, s.from, s.at, s.to);
-        }
-
-        if (resizeState.wrapBounds != null) {
-            gc.useStyle(DrawingStyle.GUIDELINE);
-            int wrapWidth = resizeState.wrapBounds.w;
-            int wrapHeight = resizeState.wrapBounds.h;
-
-            // Show the "wrap_content" guideline.
-            // If we are showing both the wrap_width and wrap_height lines
-            // then we show at most the rectangle formed by the two lines;
-            // otherwise we show the entire width of the line
-            if (resizeState.horizontalEdgeType != null) {
-                int y = -1;
-                switch (resizeState.horizontalEdgeType) {
-                    case TOP:
-                        y = b.y + b.h - wrapHeight;
-                        break;
-                    case BOTTOM:
-                        y = b.y + wrapHeight;
-                        break;
-                    default: assert false : resizeState.horizontalEdgeType;
-                }
-                if (resizeState.verticalEdgeType != null) {
-                    switch (resizeState.verticalEdgeType) {
-                        case LEFT:
-                            gc.drawLine(b.x + b.w - wrapWidth, y, b.x + b.w, y);
-                            break;
-                        case RIGHT:
-                            gc.drawLine(b.x, y, b.x + wrapWidth, y);
-                            break;
-                        default: assert false : resizeState.verticalEdgeType;
-                    }
-                } else {
-                    gc.drawLine(b.x, y, b.x + b.w, y);
-                }
-            }
-            if (resizeState.verticalEdgeType != null) {
-                int x = -1;
-                switch (resizeState.verticalEdgeType) {
-                    case LEFT:
-                        x = b.x + b.w - wrapWidth;
-                        break;
-                    case RIGHT:
-                        x = b.x + wrapWidth;
-                        break;
-                    default: assert false : resizeState.verticalEdgeType;
-                }
-                if (resizeState.horizontalEdgeType != null) {
-                    switch (resizeState.horizontalEdgeType) {
-                        case TOP:
-                            gc.drawLine(x, b.y + b.h - wrapHeight, x, b.y + b.h);
-                            break;
-                        case BOTTOM:
-                            gc.drawLine(x, b.y, x, b.y + wrapHeight);
-                            break;
-                        default: assert false : resizeState.horizontalEdgeType;
-                    }
-                } else {
-                    gc.drawLine(x, b.y, x, b.y + b.h);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the maximum number of pixels will be considered a "match" when snapping
-     * resize or move positions to edges or other constraints
-     *
-     * @return the maximum number of pixels to consider for snapping
-     */
-    public static final int getMaxMatchDistance() {
-        // TODO - make constant once we're happy with the feel
-        return 20;
-    }
-
-    @Override
-    public void onResizeUpdate(@Nullable DropFeedback feedback, @NonNull INode child,
-            @NonNull INode parent, @NonNull Rect newBounds, int modifierMask) {
-        ResizeState state = (ResizeState) feedback.userData;
-        state.bounds = newBounds;
-        state.modifierMask = modifierMask;
-
-        // Match on wrap bounds
-        state.wrapWidth = state.wrapHeight = false;
-        if (state.wrapBounds != null) {
-            Rect b = state.wrapBounds;
-            int maxMatchDistance = getMaxMatchDistance();
-            if (state.horizontalEdgeType != null) {
-                if (Math.abs(newBounds.h - b.h) < maxMatchDistance) {
-                    state.wrapHeight = true;
-                    if (state.horizontalEdgeType == SegmentType.TOP) {
-                        newBounds.y += newBounds.h - b.h;
-                    }
-                    newBounds.h = b.h;
-                }
-            }
-            if (state.verticalEdgeType != null) {
-                if (Math.abs(newBounds.w - b.w) < maxMatchDistance) {
-                    state.wrapWidth = true;
-                    if (state.verticalEdgeType == SegmentType.LEFT) {
-                        newBounds.x += newBounds.w - b.w;
-                    }
-                    newBounds.w = b.w;
-                }
-            }
-        }
-
-        // Match on fill bounds
-        state.horizontalFillSegment = null;
-        state.fillHeight = false;
-        if (state.horizontalEdgeType == SegmentType.BOTTOM && !state.wrapHeight) {
-            Rect parentBounds = parent.getBounds();
-            state.horizontalFillSegment = new Segment(parentBounds.y2(), newBounds.x,
-                newBounds.x2(),
-                null /*node*/, null /*id*/, SegmentType.BOTTOM, MarginType.NO_MARGIN);
-            if (Math.abs(newBounds.y2() - parentBounds.y2()) < getMaxMatchDistance()) {
-                state.fillHeight = true;
-                newBounds.h = parentBounds.y2() - newBounds.y;
-            }
-        }
-        state.verticalFillSegment = null;
-        state.fillWidth = false;
-        if (state.verticalEdgeType == SegmentType.RIGHT && !state.wrapWidth) {
-            Rect parentBounds = parent.getBounds();
-            state.verticalFillSegment = new Segment(parentBounds.x2(), newBounds.y,
-                newBounds.y2(),
-                null /*node*/, null /*id*/, SegmentType.RIGHT, MarginType.NO_MARGIN);
-            if (Math.abs(newBounds.x2() - parentBounds.x2()) < getMaxMatchDistance()) {
-                state.fillWidth = true;
-                newBounds.w = parentBounds.x2() - newBounds.x;
-            }
-        }
-
-        feedback.tooltip = getResizeUpdateMessage(state, child, parent,
-                newBounds, state.horizontalEdgeType, state.verticalEdgeType);
-    }
-
-    @Override
-    public void onResizeEnd(@Nullable DropFeedback feedback, @NonNull INode child,
-            final @NonNull INode parent, final @NonNull Rect newBounds) {
-        final Rect oldBounds = child.getBounds();
-        if (oldBounds.w != newBounds.w || oldBounds.h != newBounds.h) {
-            final ResizeState state = (ResizeState) feedback.userData;
-            child.editXml("Resize", new INodeHandler() {
-                @Override
-                public void handle(@NonNull INode n) {
-                    setNewSizeBounds(state, n, parent, oldBounds, newBounds,
-                            state.horizontalEdgeType, state.verticalEdgeType);
-                }
-            });
-        }
-    }
-
-    /**
-     * Returns the message to display to the user during the resize operation
-     *
-     * @param resizeState the current resize state
-     * @param child the child node being resized
-     * @param parent the parent of the resized node
-     * @param newBounds the new bounds to resize the child to, in pixels
-     * @param horizontalEdge the horizontal edge being resized
-     * @param verticalEdge the vertical edge being resized
-     * @return the message to display for the current resize bounds
-     */
-    protected String getResizeUpdateMessage(ResizeState resizeState, INode child, INode parent,
-            Rect newBounds, SegmentType horizontalEdge, SegmentType verticalEdge) {
-        String width = resizeState.getWidthAttribute();
-        String height = resizeState.getHeightAttribute();
-
-        if (horizontalEdge == null) {
-            return width;
-        } else if (verticalEdge == null) {
-            return height;
-        } else {
-            // U+00D7: Unicode for multiplication sign
-            return String.format("%s \u00D7 %s", width, height);
-        }
-    }
-
-    /**
-     * Performs the edit on the node to complete a resizing operation. The actual edit
-     * part is pulled out such that subclasses can change/add to the edits and be part of
-     * the same undo event
-     *
-     * @param resizeState the current resize state
-     * @param node the child node being resized
-     * @param layout the parent of the resized node
-     * @param newBounds the new bounds to resize the child to, in pixels
-     * @param horizontalEdge the horizontal edge being resized
-     * @param verticalEdge the vertical edge being resized
-     */
-    protected void setNewSizeBounds(ResizeState resizeState, INode node, INode layout,
-            Rect oldBounds, Rect newBounds, SegmentType horizontalEdge, SegmentType verticalEdge) {
-        if (verticalEdge != null
-            && (newBounds.w != oldBounds.w || resizeState.wrapWidth || resizeState.fillWidth)) {
-            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, resizeState.getWidthAttribute());
-        }
-        if (horizontalEdge != null
-            && (newBounds.h != oldBounds.h || resizeState.wrapHeight || resizeState.fillHeight)) {
-            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, resizeState.getHeightAttribute());
-        }
-    }
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
deleted file mode 100644
index 83ce9ef..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
+++ /dev/null
@@ -1,996 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ide.common.layout;
-
-import static com.android.SdkConstants.ANDROID_URI;
-import static com.android.SdkConstants.ATTR_CLASS;
-import static com.android.SdkConstants.ATTR_HINT;
-import static com.android.SdkConstants.ATTR_ID;
-import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT;
-import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX;
-import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH;
-import static com.android.SdkConstants.ATTR_STYLE;
-import static com.android.SdkConstants.ATTR_TEXT;
-import static com.android.SdkConstants.DOT_LAYOUT_PARAMS;
-import static com.android.SdkConstants.ID_PREFIX;
-import static com.android.SdkConstants.NEW_ID_PREFIX;
-import static com.android.SdkConstants.VALUE_FALSE;
-import static com.android.SdkConstants.VALUE_FILL_PARENT;
-import static com.android.SdkConstants.VALUE_MATCH_PARENT;
-import static com.android.SdkConstants.VALUE_TRUE;
-import static com.android.SdkConstants.VALUE_WRAP_CONTENT;
-import static com.android.SdkConstants.VIEW_FRAGMENT;
-
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
-import com.android.ide.common.api.AbstractViewRule;
-import com.android.ide.common.api.IAttributeInfo;
-import com.android.ide.common.api.IAttributeInfo.Format;
-import com.android.ide.common.api.IClientRulesEngine;
-import com.android.ide.common.api.IDragElement;
-import com.android.ide.common.api.IMenuCallback;
-import com.android.ide.common.api.INode;
-import com.android.ide.common.api.IViewMetadata;
-import com.android.ide.common.api.IViewRule;
-import com.android.ide.common.api.RuleAction;
-import com.android.ide.common.api.RuleAction.ActionProvider;
-import com.android.ide.common.api.RuleAction.ChoiceProvider;
-import com.android.resources.ResourceType;
-import com.android.utils.Pair;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-/**
- * Common IViewRule processing to all view and layout classes.
- */
-public class BaseViewRule extends AbstractViewRule {
-    /** List of recently edited properties */
-    private static List<String> sRecent = new LinkedList<String>();
-
-    /** Maximum number of recent properties to track and list */
-    private final static int MAX_RECENT_COUNT = 12;
-
-    // Strings used as internal ids, group ids and prefixes for actions
-    private static final String FALSE_ID = "false"; //$NON-NLS-1$
-    private static final String TRUE_ID = "true"; //$NON-NLS-1$
-    private static final String PROP_PREFIX = "@prop@"; //$NON-NLS-1$
-    private static final String CLEAR_ID = "clear"; //$NON-NLS-1$
-    private static final String ZCUSTOM = "zcustom"; //$NON-NLS-1$
-
-    protected IClientRulesEngine mRulesEngine;
-
-    // Cache of attributes. Key is FQCN of a node mixed with its view hierarchy
-    // parent. Values are a custom map as needed by getContextMenu.
-    private Map<String, Map<String, Prop>> mAttributesMap =
-        new HashMap<String, Map<String, Prop>>();
-
-    @Override
-    public boolean onInitialize(@NonNull String fqcn, @NonNull IClientRulesEngine engine) {
-        mRulesEngine = engine;
-
-        // This base rule can handle any class so we don't need to filter on
-        // FQCN. Derived classes should do so if they can handle some
-        // subclasses.
-
-        // If onInitialize returns false, it means it can't handle the given
-        // FQCN and will be unloaded.
-
-        return true;
-    }
-
-    /**
-     * Returns the {@link IClientRulesEngine} associated with this {@link IViewRule}
-     *
-     * @return the {@link IClientRulesEngine} associated with this {@link IViewRule}
-     */
-    public IClientRulesEngine getRulesEngine() {
-        return mRulesEngine;
-    }
-
-    // === Context Menu ===
-
-    /**
-     * Generate custom actions for the context menu: <br/>
-     * - Explicit layout_width and layout_height attributes.
-     * - List of all other simple toggle attributes.
-     */
-    @Override
-    public void addContextMenuActions(@NonNull List<RuleAction> actions,
-            final @NonNull INode selectedNode) {
-        String width = null;
-        String currentWidth = selectedNode.getStringAttr(ANDROID_URI, ATTR_LAYOUT_WIDTH);
-
-        String fillParent = getFillParentValueName();
-        boolean canMatchParent = supportsMatchParent();
-        if (canMatchParent && VALUE_FILL_PARENT.equals(currentWidth)) {
-            currentWidth = VALUE_MATCH_PARENT;
-        } else if (!canMatchParent && VALUE_MATCH_PARENT.equals(currentWidth)) {
-            currentWidth = VALUE_FILL_PARENT;
-        } else if (!VALUE_WRAP_CONTENT.equals(currentWidth) && !fillParent.equals(currentWidth)) {
-            width = currentWidth;
-        }
-
-        String height = null;
-        String currentHeight = selectedNode.getStringAttr(ANDROID_URI, ATTR_LAYOUT_HEIGHT);
-
-        if (canMatchParent && VALUE_FILL_PARENT.equals(currentHeight)) {
-            currentHeight = VALUE_MATCH_PARENT;
-        } else if (!canMatchParent && VALUE_MATCH_PARENT.equals(currentHeight)) {
-            currentHeight = VALUE_FILL_PARENT;
-        } else if (!VALUE_WRAP_CONTENT.equals(currentHeight)
-                && !fillParent.equals(currentHeight)) {
-            height = currentHeight;
-        }
-        final String newWidth = width;
-        final String newHeight = height;
-
-        final IMenuCallback onChange = new IMenuCallback() {
-            @Override
-            public void action(
-                    final @NonNull RuleAction action,
-                    final @NonNull List<? extends INode> selectedNodes,
-                    final @Nullable String valueId, final @Nullable Boolean newValue) {
-                String fullActionId = action.getId();
-                boolean isProp = fullActionId.startsWith(PROP_PREFIX);
-                final String actionId = isProp ?
-                        fullActionId.substring(PROP_PREFIX.length()) : fullActionId;
-
-                if (fullActionId.equals(ATTR_LAYOUT_WIDTH)) {
-                    final String newAttrValue = getValue(valueId, newWidth);
-                    if (newAttrValue != null) {
-                        for (INode node : selectedNodes) {
-                            node.editXml("Change Attribute " + ATTR_LAYOUT_WIDTH,
-                                    new PropertySettingNodeHandler(ANDROID_URI,
-                                            ATTR_LAYOUT_WIDTH, newAttrValue));
-                        }
-                        editedProperty(ATTR_LAYOUT_WIDTH);
-                    }
-                    return;
-                } else if (fullActionId.equals(ATTR_LAYOUT_HEIGHT)) {
-                    // Ask the user
-                    final String newAttrValue = getValue(valueId, newHeight);
-                    if (newAttrValue != null) {
-                        for (INode node : selectedNodes) {
-                            node.editXml("Change Attribute " + ATTR_LAYOUT_HEIGHT,
-                                    new PropertySettingNodeHandler(ANDROID_URI,
-                                            ATTR_LAYOUT_HEIGHT, newAttrValue));
-                        }
-                        editedProperty(ATTR_LAYOUT_HEIGHT);
-                    }
-                    return;
-                } else if (fullActionId.equals(ATTR_ID)) {
-                    // Ids must be set individually so open the id dialog for each
-                    // selected node (though allow cancel to break the loop)
-                    for (INode node : selectedNodes) {
-                        if (!mRulesEngine.rename(node)) {
-                            break;
-                        }
-                    }
-                    editedProperty(ATTR_ID);
-                    return;
-                } else if (isProp) {
-                    INode firstNode = selectedNodes.get(0);
-                    String key = getPropertyMapKey(selectedNode);
-                    Map<String, Prop> props = mAttributesMap.get(key);
-                    final Prop prop = (props != null) ? props.get(actionId) : null;
-
-                    if (prop != null) {
-                        editedProperty(actionId);
-
-                        // For custom values (requiring an input dialog) input the
-                        // value outside the undo-block.
-                        // Input the value as a text, unless we know it's the "text" or
-                        // "style" attributes (where we know we want to ask for specific
-                        // resource types).
-                        String uri = ANDROID_URI;
-                        String v = null;
-                        if (prop.isStringEdit()) {
-                            boolean isStyle = actionId.equals(ATTR_STYLE);
-                            boolean isText = actionId.equals(ATTR_TEXT);
-                            boolean isHint = actionId.equals(ATTR_HINT);
-                            if (isStyle || isText || isHint) {
-                                String resourceTypeName = isStyle
-                                        ? ResourceType.STYLE.getName()
-                                        : ResourceType.STRING.getName();
-                                String oldValue = selectedNodes.size() == 1
-                                    ? (isStyle ? firstNode.getStringAttr(ATTR_STYLE, actionId)
-                                            : firstNode.getStringAttr(ANDROID_URI, actionId))
-                                    : ""; //$NON-NLS-1$
-                                oldValue = ensureValidString(oldValue);
-                                v = mRulesEngine.displayResourceInput(resourceTypeName, oldValue);
-                                if (isStyle) {
-                                    uri = null;
-                                }
-                            } else if (actionId.equals(ATTR_CLASS) && selectedNodes.size() >= 1 &&
-                                    VIEW_FRAGMENT.equals(selectedNodes.get(0).getFqcn())) {
-                                v = mRulesEngine.displayFragmentSourceInput();
-                                uri = null;
-                            } else {
-                                v = inputAttributeValue(firstNode, actionId);
-                            }
-                        }
-                        final String customValue = v;
-
-                        for (INode n : selectedNodes) {
-                            if (prop.isToggle()) {
-                                // case of toggle
-                                String value = "";                  //$NON-NLS-1$
-                                if (valueId.equals(TRUE_ID)) {
-                                    value = newValue ? "true" : ""; //$NON-NLS-1$ //$NON-NLS-2$
-                                } else if (valueId.equals(FALSE_ID)) {
-                                    value = newValue ? "false" : "";//$NON-NLS-1$ //$NON-NLS-2$
-                                }
-                                n.setAttribute(uri, actionId, value);
-                            } else if (prop.isFlag()) {
-                                // case of a flag
-                                String values = "";                 //$NON-NLS-1$
-                                if (!valueId.equals(CLEAR_ID)) {
-                                    values = n.getStringAttr(ANDROID_URI, actionId);
-                                    Set<String> newValues = new HashSet<String>();
-                                    if (values != null) {
-                                        newValues.addAll(Arrays.asList(
-                                                values.split("\\|"))); //$NON-NLS-1$
-                                    }
-                                    if (newValue) {
-                                        newValues.add(valueId);
-                                    } else {
-                                        newValues.remove(valueId);
-                                    }
-
-                                    List<String> sorted = new ArrayList<String>(newValues);
-                                    Collections.sort(sorted);
-                                    values = join('|', sorted);
-
-                                    // Special case
-                                    if (valueId.equals("normal")) { //$NON-NLS-1$
-                                        // For textStyle for example, if you have "bold|italic"
-                                        // and you select the "normal" property, this should
-                                        // not behave in the normal flag way and "or" itself in;
-                                        // it should replace the other two.
-                                        // This also applies to imeOptions.
-                                        values = valueId;
-                                    }
-                                }
-                                n.setAttribute(uri, actionId, values);
-                            } else if (prop.isEnum()) {
-                                // case of an enum
-                                String value = "";                   //$NON-NLS-1$
-                                if (!valueId.equals(CLEAR_ID)) {
-                                    value = newValue ? valueId : ""; //$NON-NLS-1$
-                                }
-                                n.setAttribute(uri, actionId, value);
-                            } else {
-                                assert prop.isStringEdit();
-                                // We've already received the value outside the undo block
-                                if (customValue != null) {
-                                    n.setAttribute(uri, actionId, customValue);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            /**
-             * Input the custom value for the given attribute. This will use the Reference
-             * Chooser if it is a reference value, otherwise a plain text editor.
-             */
-            private String inputAttributeValue(final INode node, final String attribute) {
-                String oldValue = node.getStringAttr(ANDROID_URI, attribute);
-                oldValue = ensureValidString(oldValue);
-                IAttributeInfo attributeInfo = node.getAttributeInfo(ANDROID_URI, attribute);
-                if (attributeInfo != null
-                        && attributeInfo.getFormats().contains(Format.REFERENCE)) {
-                    return mRulesEngine.displayReferenceInput(oldValue);
-                } else {
-                    // A single resource type? If so use a resource chooser initialized
-                    // to this specific type
-                    /* This does not work well, because the metadata is a bit misleading:
-                     * for example a Button's "text" property and a Button's "onClick" property
-                     * both claim to be of type [string], but @string/ is NOT valid for
-                     * onClick..
-                    if (attributeInfo != null && attributeInfo.getFormats().length == 1) {
-                        // Resource chooser
-                        Format format = attributeInfo.getFormats()[0];
-                        return mRulesEngine.displayResourceInput(format.name(), oldValue);
-                    }
-                    */
-
-                    // Fallback: just edit the raw XML string
-                    String message = String.format("New %1$s Value:", attribute);
-                    return mRulesEngine.displayInput(message, oldValue, null);
-                }
-            }
-
-            /**
-             * Returns the value (which will ask the user if the value is the special
-             * {@link #ZCUSTOM} marker
-             */
-            private String getValue(String valueId, String defaultValue) {
-                if (valueId.equals(ZCUSTOM)) {
-                    if (defaultValue == null) {
-                        defaultValue = "";
-                    }
-                    String value = mRulesEngine.displayInput(
-                            "Set custom layout attribute value (example: 50dp)",
-                            defaultValue, null);
-                    if (value != null && value.trim().length() > 0) {
-                        return value.trim();
-                    } else {
-                        return null;
-                    }
-                }
-
-                return valueId;
-            }
-        };
-
-        IAttributeInfo textAttribute = selectedNode.getAttributeInfo(ANDROID_URI, ATTR_TEXT);
-        if (textAttribute != null) {
-            actions.add(RuleAction.createAction(PROP_PREFIX + ATTR_TEXT, "Edit Text...", onChange,
-                    null, 10, true));
-        }
-
-        String editIdLabel = selectedNode.getStringAttr(ANDROID_URI, ATTR_ID) != null ?
-                "Edit ID..." : "Assign ID...";
-        actions.add(RuleAction.createAction(ATTR_ID, editIdLabel, onChange, null, 20, true));
-
-        addCommonPropertyActions(actions, selectedNode, onChange, 21);
-
-        // Create width choice submenu
-        actions.add(RuleAction.createSeparator(32));
-        List<Pair<String, String>> widthChoices = new ArrayList<Pair<String,String>>(4);
-        widthChoices.add(Pair.of(VALUE_WRAP_CONTENT, "Wrap Content"));
-        if (canMatchParent) {
-            widthChoices.add(Pair.of(VALUE_MATCH_PARENT, "Match Parent"));
-        } else {
-            widthChoices.add(Pair.of(VALUE_FILL_PARENT, "Fill Parent"));
-        }
-        if (width != null) {
-            widthChoices.add(Pair.of(width, width));
-        }
-        widthChoices.add(Pair.of(ZCUSTOM, "Other..."));
-        actions.add(RuleAction.createChoices(
-                ATTR_LAYOUT_WIDTH, "Layout Width",
-                onChange,
-                null /* iconUrls */,
-                currentWidth,
-                null, 35,
-                true, // supportsMultipleNodes
-                widthChoices));
-
-        // Create height choice submenu
-        List<Pair<String, String>> heightChoices = new ArrayList<Pair<String,String>>(4);
-        heightChoices.add(Pair.of(VALUE_WRAP_CONTENT, "Wrap Content"));
-        if (canMatchParent) {
-            heightChoices.add(Pair.of(VALUE_MATCH_PARENT, "Match Parent"));
-        } else {
-            heightChoices.add(Pair.of(VALUE_FILL_PARENT, "Fill Parent"));
-        }
-        if (height != null) {
-            heightChoices.add(Pair.of(height, height));
-        }
-        heightChoices.add(Pair.of(ZCUSTOM, "Other..."));
-        actions.add(RuleAction.createChoices(
-                ATTR_LAYOUT_HEIGHT, "Layout Height",
-                onChange,
-                null /* iconUrls */,
-                currentHeight,
-                null, 40,
-                true,
-                heightChoices));
-
-        actions.add(RuleAction.createSeparator(45));
-        RuleAction properties = RuleAction.createChoices("properties", "Other Properties", //$NON-NLS-1$
-                onChange /*callback*/, null /*icon*/, 50,
-                true /*supportsMultipleNodes*/, new ActionProvider() {
-            @Override
-            public @NonNull List<RuleAction> getNestedActions(@NonNull INode node) {
-                List<RuleAction> propertyActionTypes = new ArrayList<RuleAction>();
-                propertyActionTypes.add(RuleAction.createChoices(
-                        "recent", "Recent", //$NON-NLS-1$
-                        onChange /*callback*/, null /*icon*/, 10,
-                        true /*supportsMultipleNodes*/, new ActionProvider() {
-                            @Override
-                            public @NonNull List<RuleAction> getNestedActions(@NonNull INode n) {
-                                List<RuleAction> propertyActions = new ArrayList<RuleAction>();
-                                addRecentPropertyActions(propertyActions, n, onChange);
-                                return propertyActions;
-                            }
-                }));
-
-                propertyActionTypes.add(RuleAction.createSeparator(20));
-
-                addInheritedProperties(propertyActionTypes, node, onChange, 30);
-
-                propertyActionTypes.add(RuleAction.createSeparator(50));
-                propertyActionTypes.add(RuleAction.createChoices(
-                        "layoutparams", "Layout Parameters", //$NON-NLS-1$
-                        onChange /*callback*/, null /*icon*/, 60,
-                        true /*supportsMultipleNodes*/, new ActionProvider() {
-                            @Override
-                            public @NonNull List<RuleAction> getNestedActions(@NonNull INode n) {
-                                List<RuleAction> propertyActions = new ArrayList<RuleAction>();
-                                addPropertyActions(propertyActions, n, onChange, null, true);
-                                return propertyActions;
-                            }
-                }));
-
-                propertyActionTypes.add(RuleAction.createSeparator(70));
-
-                propertyActionTypes.add(RuleAction.createChoices(
-                        "allprops", "All By Name", //$NON-NLS-1$
-                        onChange /*callback*/, null /*icon*/, 80,
-                        true /*supportsMultipleNodes*/, new ActionProvider() {
-                            @Override
-                            public @NonNull List<RuleAction> getNestedActions(@NonNull INode n) {
-                                List<RuleAction> propertyActions = new ArrayList<RuleAction>();
-                                addPropertyActions(propertyActions, n, onChange, null, false);
-                                return propertyActions;
-                            }
-                }));
-
-                return propertyActionTypes;
-            }
-        });
-
-        actions.add(properties);
-    }
-
-    @Override
-    @Nullable
-    public String getDefaultActionId(@NonNull final INode selectedNode) {
-        IAttributeInfo textAttribute = selectedNode.getAttributeInfo(ANDROID_URI, ATTR_TEXT);
-        if (textAttribute != null) {
-            return PROP_PREFIX + ATTR_TEXT;
-        }
-
-        return null;
-    }
-
-    private static String getPropertyMapKey(INode node) {
-        // Compute the key for mAttributesMap. This depends on the type of this
-        // node and its parent in the view hierarchy.
-        StringBuilder sb = new StringBuilder();
-        sb.append(node.getFqcn());
-        sb.append('_');
-        INode parent = node.getParent();
-        if (parent != null) {
-            sb.append(parent.getFqcn());
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Adds menu items for the inherited attributes, one pull-right menu for each super class
-     * that defines attributes.
-     *
-     * @param propertyActionTypes the actions list to add into
-     * @param node the node to apply the attributes to
-     * @param onChange the callback to use for setting attributes
-     * @param sortPriority the initial sort attribute for the first menu item
-     */
-    private void addInheritedProperties(List<RuleAction> propertyActionTypes, INode node,
-            final IMenuCallback onChange, int sortPriority) {
-        List<String> attributeSources = node.getAttributeSources();
-        for (final String definedBy : attributeSources) {
-            String sourceClass = definedBy;
-
-            // Strip package prefixes when necessary
-            int index = sourceClass.length();
-            if (sourceClass.endsWith(DOT_LAYOUT_PARAMS)) {
-                index = sourceClass.length() - DOT_LAYOUT_PARAMS.length() - 1;
-            }
-            int lastDot = sourceClass.lastIndexOf('.', index);
-            if (lastDot != -1) {
-                sourceClass = sourceClass.substring(lastDot + 1);
-            }
-
-            String label;
-            if (definedBy.equals(node.getFqcn())) {
-                label = String.format("Defined by %1$s", sourceClass);
-            } else {
-                label = String.format("Inherited from %1$s", sourceClass);
-            }
-
-            propertyActionTypes.add(RuleAction.createChoices("def_" + definedBy,
-                    label,
-                    onChange /*callback*/, null /*icon*/, sortPriority++,
-                    true /*supportsMultipleNodes*/, new ActionProvider() {
-                        @Override
-                        public @NonNull List<RuleAction> getNestedActions(@NonNull INode n) {
-                            List<RuleAction> propertyActions = new ArrayList<RuleAction>();
-                            addPropertyActions(propertyActions, n, onChange, definedBy, false);
-                            return propertyActions;
-                        }
-           }));
-        }
-    }
-
-    /**
-     * Creates a list of properties that are commonly edited for views of the
-     * selected node's type
-     */
-    private void addCommonPropertyActions(List<RuleAction> actions, INode selectedNode,
-            IMenuCallback onChange, int sortPriority) {
-        Map<String, Prop> properties = getPropertyMetadata(selectedNode);
-        IViewMetadata metadata = mRulesEngine.getMetadata(selectedNode.getFqcn());
-        if (metadata != null) {
-            List<String> attributes = metadata.getTopAttributes();
-            if (attributes.size() > 0) {
-                for (String attribute : attributes) {
-                    // Text and ID are handled manually in the menu construction code because
-                    // we want to place them consistently and customize the action label
-                    if (ATTR_TEXT.equals(attribute) || ATTR_ID.equals(attribute)) {
-                        continue;
-                    }
-
-                    Prop property = properties.get(attribute);
-                    if (property != null) {
-                        String title = property.getTitle();
-                        if (title.endsWith("...")) {
-                            title = String.format("Edit %1$s", property.getTitle());
-                        }
-                        actions.add(createPropertyAction(property, attribute, title,
-                                selectedNode, onChange, sortPriority));
-                        sortPriority++;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Record that the given property was just edited; adds it to the front of
-     * the recently edited property list
-     *
-     * @param property the name of the property
-     */
-    static void editedProperty(String property) {
-        if (sRecent.contains(property)) {
-            sRecent.remove(property);
-        } else if (sRecent.size() > MAX_RECENT_COUNT) {
-            sRecent.remove(sRecent.size() - 1);
-        }
-        sRecent.add(0, property);
-    }
-
-    /**
-     * Creates a list of recently modified properties that apply to the given selected node
-     */
-    private void addRecentPropertyActions(List<RuleAction> actions, INode selectedNode,
-            IMenuCallback onChange) {
-        int sortPriority = 10;
-        Map<String, Prop> properties = getPropertyMetadata(selectedNode);
-        for (String attribute : sRecent) {
-            Prop property = properties.get(attribute);
-            if (property != null) {
-                actions.add(createPropertyAction(property, attribute, property.getTitle(),
-                        selectedNode, onChange, sortPriority));
-                sortPriority += 10;
-            }
-        }
-    }
-
-    /**
-     * Creates a list of nested actions representing the property-setting
-     * actions for the given selected node
-     */
-    private void addPropertyActions(List<RuleAction> actions, INode selectedNode,
-            IMenuCallback onChange, String definedBy, boolean layoutParamsOnly) {
-
-        Map<String, Prop> properties = getPropertyMetadata(selectedNode);
-
-        int sortPriority = 10;
-        for (Map.Entry<String, Prop> entry : properties.entrySet()) {
-            String id = entry.getKey();
-            Prop property = entry.getValue();
-            if (layoutParamsOnly) {
-                // If we have definedBy information, that is most accurate; all layout
-                // params will be defined by a class whose name ends with
-                // .LayoutParams:
-                if (definedBy != null) {
-                    if (!definedBy.endsWith(DOT_LAYOUT_PARAMS)) {
-                        continue;
-                    }
-                } else if (!id.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) {
-                    continue;
-                }
-            }
-            if (definedBy != null && !definedBy.equals(property.getDefinedBy())) {
-                continue;
-            }
-            actions.add(createPropertyAction(property, id, property.getTitle(),
-                    selectedNode, onChange, sortPriority));
-            sortPriority += 10;
-        }
-
-        // The properties are coming out of map key order which isn't right, so sort
-        // alphabetically instead
-        Collections.sort(actions, new Comparator<RuleAction>() {
-            @Override
-            public int compare(RuleAction action1, RuleAction action2) {
-                return action1.getTitle().compareTo(action2.getTitle());
-            }
-        });
-    }
-
-    private RuleAction createPropertyAction(Prop p, String id, String title, INode selectedNode,
-            IMenuCallback onChange, int sortPriority) {
-        if (p.isToggle()) {
-            // Toggles are handled as a multiple-choice between true, false
-            // and nothing (clear)
-            String value = selectedNode.getStringAttr(ANDROID_URI, id);
-            if (value != null) {
-                value = value.toLowerCase(Locale.US);
-            }
-            if (VALUE_TRUE.equals(value)) {
-                value = TRUE_ID;
-            } else if (VALUE_FALSE.equals(value)) {
-                value = FALSE_ID;
-            } else {
-                value = CLEAR_ID;
-            }
-            return RuleAction.createChoices(PROP_PREFIX + id, title,
-                    onChange, BOOLEAN_CHOICE_PROVIDER,
-                    value,
-                    null, sortPriority,
-                    true);
-        } else if (p.getChoices() != null) {
-            // Enum or flags. Their possible values are the multiple-choice
-            // items, with an extra "clear" option to remove everything.
-            String current = selectedNode.getStringAttr(ANDROID_URI, id);
-            if (current == null || current.length() == 0) {
-                current = CLEAR_ID;
-            }
-            return RuleAction.createChoices(PROP_PREFIX + id, title,
-                    onChange, new EnumPropertyChoiceProvider(p),
-                    current,
-                    null, sortPriority,
-                    true);
-        } else {
-            return RuleAction.createAction(
-                    PROP_PREFIX + id,
-                    title,
-                    onChange,
-                    null, sortPriority,
-                    true);
-        }
-    }
-
-    private Map<String, Prop> getPropertyMetadata(final INode selectedNode) {
-        String key = getPropertyMapKey(selectedNode);
-        Map<String, Prop> props = mAttributesMap.get(key);
-        if (props == null) {
-            // Prepare the property map
-            props = new HashMap<String, Prop>();
-            for (IAttributeInfo attrInfo : selectedNode.getDeclaredAttributes()) {
-                String id = attrInfo != null ? attrInfo.getName() : null;
-                if (id == null || id.equals(ATTR_LAYOUT_WIDTH) || id.equals(ATTR_LAYOUT_HEIGHT)) {
-                    // Layout width/height are already handled at the root level
-                    continue;
-                }
-                if (attrInfo == null) {
-                    continue;
-                }
-                EnumSet<Format> formats = attrInfo.getFormats();
-
-                String title = getAttributeDisplayName(id);
-
-                String definedBy = attrInfo != null ? attrInfo.getDefinedBy() : null;
-                if (formats.contains(IAttributeInfo.Format.BOOLEAN)) {
-                    props.put(id, new Prop(title, true, definedBy));
-                } else if (formats.contains(IAttributeInfo.Format.ENUM)) {
-                    // Convert each enum into a map id=>title
-                    Map<String, String> values = new HashMap<String, String>();
-                    if (attrInfo != null) {
-                        for (String e : attrInfo.getEnumValues()) {
-                            values.put(e, getAttributeDisplayName(e));
-                        }
-                    }
-
-                    props.put(id, new Prop(title, false, false, values, definedBy));
-                } else if (formats.contains(IAttributeInfo.Format.FLAG)) {
-                    // Convert each flag into a map id=>title
-                    Map<String, String> values = new HashMap<String, String>();
-                    if (attrInfo != null) {
-                        for (String e : attrInfo.getFlagValues()) {
-                            values.put(e, getAttributeDisplayName(e));
-                        }
-                    }
-
-                    props.put(id, new Prop(title, false, true, values, definedBy));
-                } else {
-                    props.put(id, new Prop(title + "...", false, definedBy));
-                }
-            }
-            mAttributesMap.put(key, props);
-        }
-        return props;
-    }
-
-    /**
-     * A {@link ChoiceProvder} which provides alternatives suitable for choosing
-     * values for a boolean property: true, false, or "default".
-     */
-    private static ChoiceProvider BOOLEAN_CHOICE_PROVIDER = new ChoiceProvider() {
-        @Override
-        public void addChoices(@NonNull List<String> titles, @NonNull List<URL> iconUrls,
-                @NonNull List<String> ids) {
-            titles.add("True");
-            ids.add(TRUE_ID);
-
-            titles.add("False");
-            ids.add(FALSE_ID);
-
-            titles.add(RuleAction.SEPARATOR);
-            ids.add(RuleAction.SEPARATOR);
-
-            titles.add("Default");
-            ids.add(CLEAR_ID);
-        }
-    };
-
-    /**
-     * A {@link ChoiceProvider} which provides the various available
-     * attribute values available for a given {@link Prop} property descriptor.
-     */
-    private static class EnumPropertyChoiceProvider implements ChoiceProvider {
-        private Prop mProperty;
-
-        public EnumPropertyChoiceProvider(Prop property) {
-            super();
-            mProperty = property;
-        }
-
-        @Override
-        public void addChoices(@NonNull List<String> titles, @NonNull List<URL> iconUrls,
-                @NonNull List<String> ids) {
-            for (Entry<String, String> entry : mProperty.getChoices().entrySet()) {
-                ids.add(entry.getKey());
-                titles.add(entry.getValue());
-            }
-
-            titles.add(RuleAction.SEPARATOR);
-            ids.add(RuleAction.SEPARATOR);
-
-            titles.add("Default");
-            ids.add(CLEAR_ID);
-        }
-    }
-
-    /**
-     * Returns true if the given node is "filled" (e.g. has layout width set to match
-     * parent or fill parent
-     */
-    protected final boolean isFilled(INode node, String attribute) {
-        String value = node.getStringAttr(ANDROID_URI, attribute);
-        return VALUE_MATCH_PARENT.equals(value) || VALUE_FILL_PARENT.equals(value);
-    }
-
-    /**
-     * Returns fill_parent or match_parent, depending on whether the minimum supported
-     * platform supports match_parent or not
-     *
-     * @return match_parent or fill_parent depending on which is supported by the project
-     */
-    protected final String getFillParentValueName() {
-        return supportsMatchParent() ? VALUE_MATCH_PARENT : VALUE_FILL_PARENT;
-    }
-
-    /**
-     * Returns true if the project supports match_parent instead of just fill_parent
-     *
-     * @return true if the project supports match_parent instead of just fill_parent
-     */
-    protected final boolean supportsMatchParent() {
-        // fill_parent was renamed match_parent in API level 8
-        return mRulesEngine.getMinApiLevel() >= 8;
-    }
-
-    /** Join strings into a single string with the given delimiter */
-    static String join(char delimiter, Collection<String> strings) {
-        StringBuilder sb = new StringBuilder(100);
-        for (String s : strings) {
-            if (sb.length() > 0) {
-                sb.append(delimiter);
-            }
-            sb.append(s);
-        }
-        return sb.toString();
-    }
-
-    static Map<String, String> concatenate(Map<String, String> pre, Map<String, String> post) {
-        Map<String, String> result = new HashMap<String, String>(pre.size() + post.size());
-        result.putAll(pre);
-        result.putAll(post);
-        return result;
-    }
-
-    // Quick utility for building up maps declaratively to minimize the diffs
-    static Map<String, String> mapify(String... values) {
-        Map<String, String> map = new HashMap<String, String>(values.length / 2);
-        for (int i = 0; i < values.length; i += 2) {
-            String key = values[i];
-            if (key == null) {
-                continue;
-            }
-            String value = values[i + 1];
-            map.put(key, value);
-        }
-
-        return map;
-    }
-
-    /**
-     * Produces a display name for an attribute, usually capitalizing the attribute name
-     * and splitting up underscores into new words
-     *
-     * @param name the attribute name to convert
-     * @return a display name for the attribute name
-     */
-    public static String getAttributeDisplayName(String name) {
-        if (name != null && name.length() > 0) {
-            StringBuilder sb = new StringBuilder();
-            boolean capitalizeNext = true;
-            for (int i = 0, n = name.length(); i < n; i++) {
-                char c = name.charAt(i);
-                if (capitalizeNext) {
-                    c = Character.toUpperCase(c);
-                }
-                capitalizeNext = false;
-                if (c == '_') {
-                    c = ' ';
-                    capitalizeNext = true;
-                }
-                sb.append(c);
-            }
-
-            return sb.toString();
-        }
-
-        return name;
-    }
-
-
-    // ==== Paste support ====
-
-    /**
-     * Most views can't accept children so there's nothing to paste on them. In
-     * this case, defer the call to the parent layout and use the target node as
-     * an indication of where to paste.
-     */
-    @Override
-    public void onPaste(@NonNull INode targetNode, @Nullable Object targetView,
-            @NonNull IDragElement[] elements) {
-        //
-        INode parent = targetNode.getParent();
-        if (parent != null) {
-            String parentFqcn = parent.getFqcn();
-            IViewRule parentRule = mRulesEngine.loadRule(parentFqcn);
-
-            if (parentRule instanceof BaseLayoutRule) {
-                ((BaseLayoutRule) parentRule).onPasteBeforeChild(parent, targetView, targetNode,
-                        elements);
-            }
-        }
-    }
-
-    /**
-     * Support class for the context menu code. Stores state about properties in
-     * the context menu.
-     */
-    private static class Prop {
-        private final boolean mToggle;
-        private final boolean mFlag;
-        private final String mTitle;
-        private final Map<String, String> mChoices;
-        private String mDefinedBy;
-
-        public Prop(String title, boolean isToggle, boolean isFlag, Map<String, String> choices,
-                String definedBy) {
-            mTitle = title;
-            mToggle = isToggle;
-            mFlag = isFlag;
-            mChoices = choices;
-            mDefinedBy = definedBy;
-        }
-
-        public String getDefinedBy() {
-            return mDefinedBy;
-        }
-
-        public Prop(String title, boolean isToggle, String definedBy) {
-            this(title, isToggle, false, null, definedBy);
-        }
-
-        private boolean isToggle() {
-            return mToggle;
-        }
-
-        private boolean isFlag() {
-            return mFlag && mChoices != null;
-        }
-
-        private boolean isEnum() {
-            return !mFlag && mChoices != null;
-        }
-
-        private String getTitle() {
-            return mTitle;
-        }
-
-        private Map<String, String> getChoices() {
-            return mChoices;
-        }
-
-        private boolean isStringEdit() {
-            return mChoices == null && !mToggle;
-        }
-    }
-
-    /**
-     * Returns a source attribute value which points to a sample image. This is typically
-     * used to provide an initial image shown on ImageButtons, etc. There is no guarantee
-     * that the source pointed to by this method actually exists.
-     *
-     * @return a source attribute to use for sample images, never null
-     */
-    protected final String getSampleImageSrc() {
-        // Builtin graphics available since v1:
-        return "@android:drawable/btn_star"; //$NON-NLS-1$
-    }
-
-    /**
-     * Strips the {@code @+id} or {@code @id} prefix off of the given id
-     *
-     * @param id attribute to be stripped
-     * @return the id name without the {@code @+id} or {@code @id} prefix
-     */
-    @NonNull
-    public static String stripIdPrefix(@Nullable String id) {
-        if (id == null) {
-            return ""; //$NON-NLS-1$
-        } else if (id.startsWith(NEW_ID_PREFIX)) {
-            return id.substring(NEW_ID_PREFIX.length());
-        } else if (id.startsWith(ID_PREFIX)) {
-            return id.substring(ID_PREFIX.length());
-        }
-        return id;
-    }
-
-    private static String ensureValidString(String value) {
-        if (value == null) {
-            value = ""; //$NON-NLS-1$
-        }
-        return value;
-    }
- }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/CalendarViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/CalendarViewRule.java
deleted file mode 100644
index 91684e2..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/CalendarViewRule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ide.common.layout;
-
-import static com.android.SdkConstants.ANDROID_URI;
-import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT;
-import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH;
-
-import com.android.annotations.NonNull;
-import com.android.ide.common.api.INode;
-import com.android.ide.common.api.IViewRule;
-import com.android.ide.common.api.InsertType;
-
-/**
- * An {@link IViewRule} for android.widget.CalendarView.
- */
-public class CalendarViewRule extends BaseViewRule {
-
-    @Override
-    public void onCreate(@NonNull INode node, @NonNull INode parent,
-            @NonNull InsertType insertType) {
-        super.onCreate(node, parent, insertType);
-
-        // CalendarViews need a lot of space, and the wrapping doesn't seem to work
-        // well anyway; it reports a much-to-small size than actually accommodates its
-        // content.
-        node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, getFillParentValueName());
-        node.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, getFillParentValueName());
-    }
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DatePickerRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DatePickerRule.java
deleted file mode 100644
index a635a9a..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DatePickerRule.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ide.common.layout;
-
-public class DatePickerRule extends IgnoredLayoutRule {
-    // A DatePicker inherits from FrameLayout but is not a general purpose
-    // FrameLayout
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java
deleted file mode 100644
index 606bbd8..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project</