Jeff Brown b530aeb0fe resolved conflicts for merge of f0b9ee96 to master ...

Change-Id: I1b347e895049474e11076c60074dc5918cfe1405

2013-11-11 16:10:53 -08:00

..

admin

…

backup

…

ActionBar.java

…

Activity.java

am d35e94a3: am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev

2013-11-01 13:21:01 -07:00

ActivityGroup.java

…

ActivityManager.java

Fix issue #11223338: Not retaining service started state while restarting

2013-11-06 16:42:17 -08:00

ActivityManagerNative.java

…

ActivityOptions.java

Make Scenes and Transitions first-class in PhoneWindow/Themes

2013-11-05 17:49:56 -08:00

ActivityThread.java

…

AlarmManager.java

…

AlertDialog.java

…

AliasActivity.java

…

AppGlobals.java

…

Application.java

…

ApplicationErrorReport.java

…

ApplicationLoaders.java

…

ApplicationPackageManager.java

…

ApplicationThreadNative.java

…

AppOpsManager.aidl

…

AppOpsManager.java

AppOpsManager: fix javadoc misspelling.

2013-11-01 15:28:29 -07:00

BackStackRecord.java

…

ContextImpl.java

…

DatePickerDialog.java

…

Dialog.java

…

DialogFragment.java

…

DownloadManager.java

Docfixes for DownloadManager.

2013-11-04 16:25:38 -05:00

ExpandableListActivity.java

…

Fragment.java

…

FragmentBreadCrumbs.java

…

FragmentManager.java

…

FragmentTransaction.java

…

IActivityController.aidl

…

IActivityManager.java

…

IActivityPendingResult.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

…

IBackupAgent.aidl

…

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

…

Instrumentation.java

…

IntentService.java

…

IProcessObserver.aidl

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

…

IThumbnailReceiver.aidl

…

IThumbnailRetriever.aidl

…

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

…

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

…

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

…

LoaderManager.java

…

LocalActivityManager.java

…

MediaRouteActionProvider.java

Update the media router dialogs and integrate into system UI.

2013-11-10 14:39:19 -08:00

MediaRouteButton.java

resolved conflicts for merge of f0b9ee96 to master

2013-11-11 16:10:53 -08:00

NativeActivity.java

…

Notification.aidl

…

Notification.java

…

NotificationManager.java

…

OnActivityPausedListener.java

…

package.html

…

PendingIntent.aidl

…

PendingIntent.java

…

Presentation.java

…

ProgressDialog.java

…

QueuedWork.java

…

ResourcesManager.java

…

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

…

SearchManager.java

…

Service.java

…

SharedPreferencesImpl.java

…

StatusBarManager.java

Manage keyguard nav elements using transitions.

2013-11-01 11:33:48 -04:00

TabActivity.java

…

TaskStackBuilder.java

…

TimePickerDialog.java

…

UiAutomation.java

…

UiAutomationConnection.java

…

UiModeManager.java

…

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

…