Alex Klyubin 33d3c53da0 resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp ...

Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a

2015-02-11 12:37:12 -08:00

..

pm

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00

res

am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

2014-12-02 23:45:25 +00:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

[ActivityManager] Distinguish FG or BG receiver finished

2015-01-03 15:38:21 +08:00

ClipboardManager.java

…

ClipData.aidl

…

ClipData.java

Fix some documentation typos.

2014-09-30 02:52:26 +00:00

ClipDescription.aidl

…

ClipDescription.java

…

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

Fix NPE in Transport.applyBatch

2014-12-15 13:25:52 -08:00

ContentProviderClient.java

Fix issue with call backs from media process.

2014-11-19 14:29:10 -08:00

ContentProviderNative.java

Fix issue with call backs from media process.

2014-11-19 14:29:10 -08:00

ContentProviderOperation.java

Resolving resources across users.

2014-05-13 14:59:52 +01:00

ContentProviderResult.java

Resolving resources across users.

2014-05-13 14:59:52 +01:00

ContentQueryMap.java

…

ContentResolver.java

Bugfix: use the correct user for ContentResolver calls

2014-09-10 18:13:12 +01:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

…

Context.java

Add MEDIA_PROJECTION_SERVICE to the ServiceName list.

2014-12-23 17:01:49 -08:00

ContextWrapper.java

Fix issue with call backs from media process.

2014-11-19 14:29:10 -08:00

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

Fix issue with call backs from media process.

2014-11-19 14:29:10 -08:00

IContentService.aidl

Do Not Merge Per-user API for master sync

2014-07-22 20:15:45 +00:00

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

2015-01-16 18:36:45 +00:00

IntentFilter.aidl

…

IntentFilter.java

Fix issue #17082301: replacePreferredActivity is ignoring userId

2014-08-16 19:34:13 -07:00

IntentSender.aidl

…

IntentSender.java

…

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

Rename getLocalApprovalIntent to createLocalApprovalIntent

2014-09-05 10:51:13 -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

Rename getLocalApprovalIntent to createLocalApprovalIntent

2014-09-05 10:51:13 -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

Fix some documentation typos.

2014-09-30 02:52:26 +00:00

UriPermission.java

…