Dianne Hackborn dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master ...

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e

2010-09-30 20:34:34 -07:00

..

pm

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

res

am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmounted

2010-09-30 19:46:46 -07:00

AbstractThreadedSyncAdapter.java

Fix the rest of the javadoc warnings.

2010-09-16 13:38:25 -04:00

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

…

ClipboardManager.java

…

ClipData.aidl

…

ClipData.java

Fix some SDK build breakage. Not all.

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

ClipDescription.aidl

…

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

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -07:00

ContentProviderClient.java

…

ContentProviderNative.java

…

ContentProviderOperation.java

Fix the rest of the javadoc warnings.

2010-09-16 13:38:25 -04:00

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

resolved conflicts for merge of a8bce7c8 to master

2010-09-27 20:25:20 -07:00

ContentService.java

…

ContentUris.java

…

ContentValues.java

Convert Numbers to Booleans when calling getAsBoolean().

2010-09-17 08:12:19 -05:00

Context.java

resolved conflicts for merge of f4c3b7e9 to master

2010-09-29 12:20:51 -07:00

ContextWrapper.java

…

CursorEntityIterator.java

…

CursorLoader.java

Making observer registration customizable.

2010-09-22 12:51:01 -07:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

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

…