Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b5522f8 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Remove conflicting package information for junit.runner and junit.textui" 

am: f3f4775a

Change-Id: Ie0ca0b2b6b5f06e90f55996625f758521c9039cb
parents cb47118a f3f4775a

test-runner/src/junit/runner/package-info.java

+1 −1
Original line number Diff line number Diff line 
/**

 * Provides JUnit v3.x test runners.

 * Utility classes supporting the junit test framework.

 */

package junit.runner;
 
 No newline at end of file

test-runner/src/junit/runner/package.html

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
<HTML>

<BODY>

Utility classes supporting the junit test framework.

</BODY>

</HTML>

test-runner/src/junit/textui/package-info.java

+1 −1
Original line number Diff line number Diff line 
/**

 * 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

test-runner/src/junit/textui/package.html

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
<HTML>

<BODY>

Utility classes supporting the junit test framework.

{@hide} - Not needed for 1.0 SDK

</BODY>

</HTML>