From f845fec30cc3a5e0c49d4365c5f9088121e94791 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 22 Feb 2017 12:43:57 +0000 Subject: [PATCH] Remove conflicting package information for junit.runner and junit.textui Removes package.html files and update package-info.java files to use same wording as previous releases. Bug: 35653948 Test: make docs Change-Id: Idbede2eb4f57818f152834fad7e75dd181fe25d6 --- test-runner/src/junit/runner/package-info.java | 2 +- test-runner/src/junit/runner/package.html | 5 ----- test-runner/src/junit/textui/package-info.java | 2 +- test-runner/src/junit/textui/package.html | 6 ------ 4 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 test-runner/src/junit/runner/package.html delete mode 100644 test-runner/src/junit/textui/package.html diff --git a/test-runner/src/junit/runner/package-info.java b/test-runner/src/junit/runner/package-info.java index b746185f333e2..364e3621456e2 100644 --- a/test-runner/src/junit/runner/package-info.java +++ b/test-runner/src/junit/runner/package-info.java @@ -1,4 +1,4 @@ /** - * Provides JUnit v3.x test runners. + * Utility classes supporting the junit test framework. */ package junit.runner; \ No newline at end of file diff --git a/test-runner/src/junit/runner/package.html b/test-runner/src/junit/runner/package.html deleted file mode 100644 index f08fa7013299d..0000000000000 --- a/test-runner/src/junit/runner/package.html +++ /dev/null @@ -1,5 +0,0 @@ - - -Utility classes supporting the junit test framework. - - diff --git a/test-runner/src/junit/textui/package-info.java b/test-runner/src/junit/textui/package-info.java index 2dcc10cf73882..28b2ef46b5824 100644 --- a/test-runner/src/junit/textui/package-info.java +++ b/test-runner/src/junit/textui/package-info.java @@ -1,5 +1,5 @@ /** - * Provides JUnit v3.x command line based tool to run tests. + * Utility classes supporting the junit test framework. * {@hide} */ package junit.textui; \ No newline at end of file diff --git a/test-runner/src/junit/textui/package.html b/test-runner/src/junit/textui/package.html deleted file mode 100644 index 723f2ae5151c7..0000000000000 --- a/test-runner/src/junit/textui/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - -Utility classes supporting the junit test framework. -{@hide} - Not needed for 1.0 SDK - -