Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9b5522f8c4

Change-Id: I4925285c1ea3027d46ac396b8ea29ac44c075e0d
This commit is contained in:
Paul Duffin
2017-02-22 15:27:51 +00:00
committed by android-build-merger
parent e13bfbde1a 9b5522f8c4
commit da4597769b
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test-runner/src/junit/runner/package-info.java
View File

@@ -1,4 +1,4 @@
/** /**
* Provides JUnit v3.x test runners. * Utility classes supporting the junit test framework.
*/ */
package junit.runner; package junit.runner;

5
test-runner/src/junit/runner/package.html
View File

@@ -1,5 +0,0 @@
<HTML>
<BODY>
Utility classes supporting the junit test framework.
</BODY>
</HTML>

2
test-runner/src/junit/textui/package-info.java
View File

@@ -1,5 +1,5 @@
/** /**
* Provides JUnit v3.x command line based tool to run tests. * Utility classes supporting the junit test framework.
* {@hide} * {@hide}
*/ */
package junit.textui; package junit.textui;

6
test-runner/src/junit/textui/package.html
View File

@@ -1,6 +0,0 @@
<HTML>
<BODY>
Utility classes supporting the junit test framework.
{@hide} - Not needed for 1.0 SDK
</BODY>
</HTML>