Winson c89d516e09 Fixing merge conflict from DR to master. ...

Change-Id: Id76602204dffa2745534e8290a14e407de639c0b

2015-10-14 14:58:51 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-10-12 05:11:44 -07:00

CaptivePortalLogin

Hotspot 2.0 relase 2 first cut.

2015-09-22 17:24:22 -07:00

DefaultContainerService

Import translations. DO NOT MERGE

2015-09-18 13:49:07 -07:00

DocumentsUI

Merge "Fix the position of the "Recents" root in DocumentsUI."

2015-10-13 19:54:23 +00:00

ExternalStorageProvider

am 4296209d: am 3d65dcbc: am 58843059: am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev

2015-09-30 20:36:43 +00:00

FakeOemFeatures

…

FusedLocation

am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

2015-09-23 02:06:09 +00:00

InputDevices

Import translations. DO NOT MERGE

2015-09-18 13:57:25 -07:00

Keyguard

am 8ba8c543: am b278ea0c: am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev

2015-09-24 04:18:01 +00:00

MtpDocumentsProvider

Add readEvent method to MtpDevice.

2015-09-25 14:54:17 +09:00

PrintSpooler

Import translations. DO NOT MERGE

2015-09-25 22:52:20 -07:00

services

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

SettingsLib

Move DreamBackend to SettingsLib

2015-10-09 14:37:32 -07:00

SettingsProvider

Check multi-user support in isUserSwitcherEnabled

2015-09-30 14:08:01 -07:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

2015-09-18 14:06:53 -07:00

StatementService

…

SystemUI

Fixing merge conflict from DR to master.

2015-10-14 14:58:51 -07:00

VpnDialogs

Moved alert setup code to onCreate

2015-10-02 16:13:05 -07:00

WallpaperCropper

am a80ea2ee: am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

2015-08-26 14:48:32 +00:00

WAPPushManager

…