Adrian Roos 0e22872666 resolved conflicts for merge of 123fb19d to master ...

Change-Id: Ie029b8d72eaf968a5224cd0b90d97b112d51ba35

2015-09-03 15:02:49 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-08-29 06:48:39 -07:00

CaptivePortalLogin

…

DefaultContainerService

…

DocumentsUI

Consume event on singleTapUp.

2015-09-02 16:06:05 -07:00

ExternalStorageProvider

Import translations. DO NOT MERGE

2015-08-05 05:25:11 -07:00

FakeOemFeatures

…

FusedLocation

…

InputDevices

Import translations. DO NOT MERGE

2015-08-31 05:32:09 -07:00

Keyguard

resolved conflicts for merge of 123fb19d to master

2015-09-03 15:02:49 -07:00

MtpDocumentsProvider

Replace hardcoded numeric literals with those in MtpConstants.

2015-09-02 16:42:36 +09:00

PrintSpooler

Import translations. DO NOT MERGE

2015-08-31 05:43:06 -07:00

services

…

SettingsLib

am 61428288: am 8a6f55e7: am 30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib.

2015-08-25 18:45:41 +00:00

SettingsProvider

Cleanup USER_OWNER in SettingsProvider[Test]

2015-09-02 09:52:02 -07:00

SharedStorageBackup

…

Shell

am fca744ce: am 573cdc42: am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev

2015-09-03 06:39:20 +00:00

StatementService

…

SystemUI

resolved conflicts for merge of 123fb19d to master

2015-09-03 15:02:49 -07:00

VpnDialogs

…

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

…