Sailesh Nepal 909d1b5755 resolved conflicts for merge of 03e88771 to master ...

Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3

2014-07-17 11:05:42 -07:00

..

pm

Dexopt for Context.createPackageContext when code is included.

2014-07-16 19:23:52 +01:00

res

Parse more split APK manifest details.

2014-07-15 18:50:00 -07:00

AbstractRestrictionsProvider.java

Revert some new APIs for restrictions provider

2014-07-15 09:43:20 -07:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

…

ClipboardManager.java

…

ClipData.aidl

…

ClipData.java

…

ClipDescription.aidl

…

ClipDescription.java

…

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

…

ContentProviderClient.java

…

ContentProviderNative.java

…

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Adds per-user APIs required by the Settings app

2014-07-02 13:34:14 +01:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

…

Context.java

TTY: frameworks/base changes

2014-07-16 21:14:58 +00:00

ContextWrapper.java

Add code cache directory for apps.

2014-07-15 22:13:26 -07:00

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

…

IContentService.aidl

Adds per-user APIs required by the Settings app

2014-07-02 13:34:14 +01:00

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

am a60bb211: am 30636967: Merge "Launch activity behind launching task." into lmp-dev

2014-07-15 19:12:23 +00:00

IntentFilter.aidl

…

IntentFilter.java

…

IntentSender.aidl

…

IntentSender.java

…

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

Revert some new APIs for restrictions provider

2014-07-15 09:43:20 -07:00

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

…

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

DO NOT MERGE Redact SyncService stuff from master

2014-06-04 22:46:25 +00:00

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

App restrictions schema and parser

2014-07-15 17:16:54 -07:00

RestrictionsManager.java

App restrictions schema and parser

2014-07-15 17:16:54 -07:00

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

am 59f61cc2: am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.

2014-05-23 19:33:57 +00:00

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

DO NOT MERGE Redact SyncService stuff from master

2014-06-04 22:46:25 +00:00

SyncRequest.aidl

…

SyncRequest.java

Remove SyncRequest.setPriority from public API

2014-06-09 20:18:25 -07:00

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

UndoManager.java

…

UndoOperation.java

…

UndoOwner.java

…

UriMatcher.java

…

UriPermission.java

…