Jason Monk 769139da03 resolve merge conflicts of daeafccfa9 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39

2017-05-29 11:10:28 +02:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2017-05-11 20:52:49 -07:00

CaptivePortalLogin

Merge "CaptivePortal: login activity UI improvements" am: cb570ec50a am: 95e0e08f61 am: 2bf886d648

2017-05-15 02:40:52 +00:00

CarrierDefaultApp

Merge "support horizontal scroll and zoom for webview" am: 63621ece0b

2017-05-11 18:15:29 +00:00

CompanionDeviceManager

Fix Companion UI crash on configuration change

2017-05-17 17:48:19 -07:00

CtsShim

…

DefaultContainerService

…

DocumentsUI

…

EasterEgg

…

ExternalStorageProvider

Merge "Use "real" free space; refresh on large changes." into oc-dev am: 6428beec23

2017-05-10 04:13:03 +00:00

ExtServices

…

ExtShared

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

…

Keyguard

…

MtpDocumentsProvider

Fix NPE in MtpDocumentsProviderTests

2017-05-18 12:54:25 +09:00

Osu

…

PrintRecommendationService

…

PrintSpooler

Import translations. DO NOT MERGE

2017-05-23 22:13:21 -07:00

services

…

SettingsLib

Merge "Add extra debug logging to WifiTracker." into oc-dev am: 04b5a63006

2017-05-26 03:01:42 +00:00

SettingsProvider

Backup / restore additional lock screen settings

2017-05-25 11:22:53 +01:00

SharedStorageBackup

…

Shell

Merge "Working around bugreport crash issues" into oc-dev am: 5176a4cda3

2017-05-25 18:27:52 +00:00

StatementService

…

SystemUI

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

VpnDialogs

…

WallpaperBackup

…

WallpaperCropper

…

WAPPushManager

…