Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df

* changes:
  Remove support for stuck threads
  Remove DisableOnDebug (new in 4.12) as it is not supported on Android
  Extra generic type information to aid certain javacs.
  Upgrade external/junit to 4.13.2

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/org/junit/runner/Computer.java b/src/main/java/org/junit/runner/Computer.java
index 8bb4b20..18d0d31 100644
--- a/src/main/java/org/junit/runner/Computer.java
+++ b/src/main/java/org/junit/runner/Computer.java
@@ -30,7 +30,17 @@ public class Computer {
             public Runner runnerForClass(Class<?> testClass) throws Throwable {
                 return getRunner(builder, testClass);
             }
-        }, classes);
+        }, classes) {
+            @Override
+            protected String getName() {
+                /*
+                 * #1320 The generated suite is not based on a real class so
+                 * only a 'null' description can be generated from it. This name
+                 * will be overridden here.
+                 */
+                return "classes";
+            }
+        };
     }
 
     /**