Jose Lima 92703e62c1 resolved conflicts for merge of 4882ddfa to master ...

Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de

2014-03-13 21:26:48 -07:00

..

mock

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

suitebuilder

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ActivityInstrumentationTestCase2.java

…

ActivityInstrumentationTestCase.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ActivityTestCase.java

…

ActivityUnitTestCase.java

…

AndroidTestRunner.java

Adding UI test automation APIs.

2013-01-22 17:56:53 -08:00

ApplicationTestCase.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

AssertionFailedError.java

…

ClassPathPackageInfo.java

…

ClassPathPackageInfoSource.java

…

ComparisonFailure.java

…

DatabaseTestUtils.java

…

InstrumentationCoreTestRunner.java

…

InstrumentationTestRunner.java

docs: Fixed typo in InstrumentationTestRunner page.

2014-01-14 12:47:34 -08:00

InstrumentationUtils.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

IsolatedContext.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

LaunchPerformanceBase.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

LoaderTestCase.java

…

MoreAsserts.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

NoExecTestResult.java

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

PackageInfoSources.java

…

PerformanceCollectorTestCase.java

…

ProviderTestCase2.java

New ContentProvider initialization for testing.

2013-02-26 16:16:14 -08:00

ProviderTestCase.java

New ContentProvider initialization for testing.

2013-02-26 16:16:14 -08:00

RenamingDelegatingContext.java

New ContentProvider initialization for testing.

2013-02-26 16:16:14 -08:00

ServiceTestCase.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SimpleCache.java

…

SingleLaunchActivityTestCase.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SyncBaseInstrumentation.java

…

TestCase.java

…

TestCaseUtil.java

…

TestPrinter.java

…

TestRunner.java

…

TestSuiteProvider.java

…

TimedTest.java

…

TouchUtils.java

…

ViewAsserts.java

…