Dianne Hackborn ade9916d5c resolved conflicts for merge of 6421ae7e to master ...

Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f

2010-09-13 21:41:57 -07:00

..

pm

Unbreak the build.

2010-09-13 11:40:44 -07:00

res

am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.

2010-09-03 15:23:46 -07:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

…

ClipboardManager.java

Improve clipboard API.

2010-08-27 11:06:01 -07:00

ClipData.aidl

Improve clipboard API.

2010-08-27 11:06:01 -07:00

ClipData.java

Fix some SDK build breakage. Not all.

2010-08-27 15:41:13 -07:00

ClipDescription.aidl

Improve clipboard API.

2010-08-27 11:06:01 -07:00

ClipDescription.java

Fix some SDK build breakage. Not all.

2010-08-27 15:41:13 -07:00

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

Improve clipboard API.

2010-08-27 11:06:01 -07:00

ContentProviderClient.java

…

ContentProviderNative.java

…

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

…

ContentService.java

…

ContentUris.java

…

ContentValues.java

Fix the documentation of ContentValues.

2010-08-25 10:19:36 -05:00

Context.java

…

ContextWrapper.java

…

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

Improve clipboard API.

2010-08-27 11:06:01 -07:00

IContentProvider.java

…

IContentService.aidl

…

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

2010-09-08 14:38:15 -07:00

IntentFilter.aidl

…

IntentFilter.java

…

IntentSender.aidl

…

IntentSender.java

…

IOnPrimaryClipChangedListener.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

…

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

…

ReceiverCallNotAllowedException.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread

2010-08-30 18:25:02 -07:00

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

…

SyncManager.java

resolved conflicts for merge of 6421ae7e to master

2010-09-13 21:41:57 -07:00

SyncOperation.java

…

SyncQueue.java

…

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

SyncStorageEngine.java

…

UriMatcher.java

…

XmlDocumentProvider.java

…