Tom Taylor f0108cda21 resolved conflicts for merge of ad2fa35d to master ...

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90

2009-12-22 10:11:55 -08:00

..

accounts

eclair snapshot

2009-11-13 13:53:39 -08:00

activity

eclair snapshot

2009-11-13 13:53:39 -08:00

content

donut snapshot

2009-07-29 14:25:07 -07:00

graphics

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

os

Implement a HierarchicalStateMachine

2009-12-08 21:22:24 -08:00

vcard

am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c

2009-12-10 10:37:52 -08:00

AndroidPerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AndroidTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ApacheHttpTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AppCacheTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

ArrayListTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

BitwiseStreamsTest.java

donut snapshot

2009-07-21 11:16:54 -07:00

BrickDeniedTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

BuildTest.java

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

CdmaSmsTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

CharSequencesTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ComponentTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentQueryMapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CreateViewTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CursorWindowTest.java

Update imports to android-common

2009-12-21 13:59:18 -08:00

DatabaseCursorTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseGeneralTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

DatabaseLocaleTest.java

auto import from //branches/cupcake/...@137873

2009-03-11 12:11:56 -07:00

DatabaseLockTest.java

AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest

2009-04-14 12:38:22 -07:00

DatabasePerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseStatementTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseStressTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DatabaseTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DropBoxTest.java

Change the DropBoxManager API slightly (this is public, but not yet released) --

2009-11-25 12:38:00 -08:00

ExpatPerformanceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GeocoderTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GoogleLoginServiceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GraphicsPerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GsmSmsTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

HashMapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HashSetTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HashtableTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HeapTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

HtmlTest.java

donut snapshot

2009-07-29 14:25:07 -07:00

InflateTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

InstanceofTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

JavaPerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

JniLibTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LabelView.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LinkedListTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LinkifyTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocketTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocationManagerTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LogTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MathTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MccTableTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

MenuTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MonitorTest.java

donut snapshot

2009-08-11 13:12:34 -07:00

NeighboringCellInfoTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

NewDatabasePerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NewDatabasePerformanceTestSuite.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ParentalControlTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PerformanceTests.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SafeSaxTest.java

Update imports to android-common

2009-12-21 13:59:18 -08:00

SearchableActivity.java

donut snapshot

2009-07-21 11:16:54 -07:00

SearchablesTest.java

Move android.server.search.SearchableInfo to android.app

2009-12-04 12:52:51 +00:00

SearchManagerTest.java

Move android.server.search.SearchableInfo to android.app

2009-12-04 12:52:51 +00:00

SerializationTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SettingsProviderTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SmsProviderTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SpannedTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SSLClientSessionCacheFactoryTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SSLTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

StringTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SuggestionProvider.java

donut snapshot

2009-07-21 11:16:54 -07:00

TestHttpClient.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestHttpServer.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TestHttpService.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TextLayoutTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TextUtilsTest.java

Unbundling work

2009-12-14 09:24:09 -08:00

TextViewPerformanceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TextViewTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ThreadBitmapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TimeTest.java

Time.parse3339 range checking and proper 'sec-frac' skip

2009-11-16 14:30:24 -06:00

TimeUtilsTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TraceTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TreeMapTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TreeSetTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

UriMatcherTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

UriTest.java

Speed up Uri.getQueryParameter by allocating less.

2009-10-26 14:46:25 -07:00

UrlRulesTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

VectorTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

VpnTest.java

eclair snapshot

2009-11-13 13:53:39 -08:00

WebkitTest.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00