Daniel Nishi 3fd8c801ba resolve merge conflicts of 7145cac to master ...

Change-Id: Idd0a8de30697687309953fd37b568207d2fc0be8

2016-07-06 14:04:36 -07:00

..

pm

Merge \\"Start shortcuts as if publisher apps did using PendingIntent\\" into nyc-mr1-dev am: 60efbf2586

2016-06-30 22:02:51 +00:00

res

Update DisplayMetrics when resizing

2016-06-24 22:11:27 +00:00

AbstractThreadedSyncAdapter.java

…

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

…

BroadcastReceiver.java

…

ClipboardManager.java

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

ClipData.aidl

…

ClipData.java

new ClipData constructor.

2016-06-13 12:54:14 -07:00

ClipDescription.aidl

…

ClipDescription.java

Hide unnecessary extra name constants in ClipDescription

2016-04-05 17:12:25 -07:00

ComponentCallbacks2.java

…

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

…

ContentProviderClient.java

…

ContentProviderNative.java

…

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Move the MIME type icon detection into the platform.

2016-07-06 10:57:06 -07:00

ContentUris.java

…

ContentValues.aidl

…

ContentValues.java

ContentValues: improve documentation

2016-05-12 16:51:52 -07:00

Context.java

Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am: 0bf31c3fa6

2016-06-22 19:27:30 +00:00

ContextWrapper.java

ContextImpl: Keep DisplayAdjustments and Display in sync

2016-06-21 17:55:58 -07:00

CursorEntityIterator.java

…

CursorLoader.java

…

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

…

IContentService.aidl

More work on issue #26390151: Add new JobScheduler API...

2016-04-05 15:58:42 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

Fix issue #27532364: Security Vulnerability in IIntentSender.send

2016-05-13 17:37:08 -07:00

Intent.aidl

…

Intent.java

Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4

2016-06-17 20:42:09 +00:00

IntentFilter.aidl

…

IntentFilter.java

DO NOT MERGE Fix intent filter priorities

2016-04-07 16:40:18 -07:00

IntentSender.aidl

…

IntentSender.java

Fix issue #27532364: Security Vulnerability in IIntentSender.send

2016-05-13 17:37:08 -07:00

IOnPrimaryClipChangedListener.aidl

…

IRestrictionsManager.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncServiceAdapter.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

Don't lose content change during rollback for loader already started

2016-04-27 13:45:38 -07:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

…

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

…

RestrictionEntry.java

…

RestrictionsManager.java

Fix the handling of bundle array in RestrictionsManager

2016-06-20 19:41:08 +00:00

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

…

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

…

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

…

SyncRequest.aidl

…

SyncRequest.java

…

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

UndoManager.java

Fix: UndoManager#saveInstanceState.

2016-06-07 08:27:50 +00:00

UndoOperation.java

…

UndoOwner.java

…

UriMatcher.java

…

UriPermission.java

…