Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 0 insertions, 30 deletions

diff --git a/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java b/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java
deleted file mode 100644
index 389ced7354af..000000000000
--- a/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.intellij.codeInsight;
-
-import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
-import com.intellij.openapi.application.PluginPathManager;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author anna
- */
-public class ConvertToThreadLocalIntentionTest extends LightQuickFixParameterizedTestCase {
-  @Override
-  protected boolean shouldBeAvailableAfterExecution() {
-    return true;
-  }
-
-  @Override
-  protected String getBasePath() {
-    return "/intentions/threadLocal";
-  }
-
-  @NotNull
-  @Override
-  protected String getTestDataPath() {
-    return PluginPathManager.getPluginHomePath("typeMigration") + "/testData";
-  }
-
-  public void test() throws Exception {
-    doAllTests();
-  }
-}
\ No newline at end of file