Christopher Tate e2c9b1af3e resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 ...

am: d6c1126fab

Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973

2016-06-17 00:18:48 +00:00

..

admin

…

assist

…

backup

…

job

…

trust

…

usage

DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

2016-02-19 21:05:07 +00:00

ActionBar.java

…

Activity.java

Don't allow concurrent permission requests.

2015-10-16 13:42:32 -07:00

ActivityGroup.java

…

ActivityManager.aidl

…

ActivityManager.java

…

ActivityManagerInternal.java

…

ActivityManagerNative.java

resolve merge conflicts of cffb19c to mnc-dev

2016-06-16 16:31:39 -07:00

ActivityOptions.java

…

ActivityThread.java

…

ActivityTransitionCoordinator.java

…

ActivityTransitionState.java

…

ActivityView.java

ActivityView gets its own thread pool.

2015-11-11 18:21:57 -05:00

AlarmManager.aidl

…

AlarmManager.java

…

AlertDialog.java

…

AliasActivity.java

…

AppGlobals.java

…

AppImportanceMonitor.java

…

Application.java

…

ApplicationErrorReport.java

…

ApplicationLoaders.java

…

ApplicationPackageManager.java

Default location is "internalOnly" when undefined.

2015-10-09 13:22:09 -07:00

ApplicationThreadNative.java

…

AppOpsManager.aidl

…

AppOpsManager.java

…

BackStackRecord.java

…

BroadcastOptions.java

…

ContextImpl.java

…

DatePickerDialog.java

…

Dialog.java

…

DialogFragment.java

…

DownloadManager.java

…

EnterTransitionCoordinator.java

…

ExitTransitionCoordinator.java

…

ExpandableListActivity.java

…

Fragment.java

Retain fragment loaders

2015-10-19 16:40:03 -07:00

FragmentBreadCrumbs.java

…

FragmentContainer.java

…

FragmentController.java

Retain fragment loaders

2015-10-19 16:40:03 -07:00

FragmentHostCallback.java

Retain fragment loaders

2015-10-19 16:40:03 -07:00

FragmentManager.java

Merge "Retain fragment loaders" into mnc-dr-dev

2015-10-20 14:36:00 +00:00

FragmentTransaction.java

…

IActivityContainer.aidl

…

IActivityContainerCallback.aidl

…

IActivityController.aidl

…

IActivityManager.java

resolve merge conflicts of cffb19c to mnc-dev

2016-06-16 16:31:39 -07:00

IActivityPendingResult.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

…

IAppTask.aidl

…

IBackupAgent.aidl

…

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

…

Instrumentation.java

…

IntentService.java

…

IProcessObserver.aidl

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

…

ITaskStackListener.aidl

…

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

…

IUidObserver.aidl

…

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

JobSchedulerImpl.java

…

KeyguardManager.java

…

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

…

LoaderManager.java

…

LocalActivityManager.java

…

MediaRouteActionProvider.java

…

MediaRouteButton.java

…

NativeActivity.java

…

Notification.aidl

…

Notification.java

Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev

2015-11-04 20:24:36 +00:00

NotificationManager.aidl

…

NotificationManager.java

…

OnActivityPausedListener.java

…

package.html

…

PackageDeleteObserver.java

…

PackageInstallObserver.java

…

PendingIntent.aidl

…

PendingIntent.java

…

Presentation.java

…

ProfilerInfo.java

…

ProgressDialog.java

…

QueuedWork.java

…

RemoteInput.java

…

ResourcesManager.java

…

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

…

SearchManager.java

…

Service.java

…

SharedElementCallback.java

…

SharedPreferencesImpl.java

…

StatusBarManager.java

…

SystemServiceRegistry.java

…

TabActivity.java

…

TaskStackBuilder.java

…

TimePickerDialog.java

…

UiAutomation.java

…

UiAutomationConnection.java

…

UiModeManager.java

…

VoiceInteractor.aidl

…

VoiceInteractor.java

…

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

…