Todd Kennedy b2f48af230 Revert "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp" ...

This reverts commit 6fa357a529a57d0421df6070d425ccc684603ef0.

Reason for revert: breaks git_pi-dev-plus-aosp build

Change-Id: I12697f8c329ab224f83856176ba989c37920774f

2018-11-09 18:38:07 +00:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2018-11-02 03:41:58 -07:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2018-10-15 21:59:06 -07:00

CarrierDefaultApp

Import translations. DO NOT MERGE

2018-11-02 03:54:40 -07:00

CompanionDeviceManager

Remove BluetoothDevice.ACTION_DISAPPEARED

2018-10-11 21:06:29 +00:00

CtsShim

…

DefaultContainerService

Import translations. DO NOT MERGE

2018-10-15 22:12:33 -07:00

DocumentsUI

…

EasterEgg

…

ExternalStorageProvider

Import translations. DO NOT MERGE

2018-10-14 19:31:30 -07:00

ExtServices

Add AndroidTest file for ExtServices

2018-10-03 16:43:09 -07:00

ExtShared

…

FakeOemFeatures

…

FusedLocation

Import translations. DO NOT MERGE

2018-10-14 19:37:07 -07:00

InputDevices

Import translations. DO NOT MERGE

2018-10-15 22:31:12 -07:00

Keyguard

…

MtpDocumentsProvider

…

overlays

Import translations. DO NOT MERGE

2018-10-15 23:44:04 -07:00

PrintRecommendationService

…

PrintSpooler

Import translations. DO NOT MERGE

2018-11-02 05:40:30 -07:00

services

…

SettingsLib

Merge "Take a context to start setting intent in DreamBackend" into pi-dev

2018-11-07 10:58:55 -08:00

SettingsProvider

Import translations. DO NOT MERGE

2018-10-15 00:49:09 -07:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

2018-11-02 05:47:07 -07:00

SimAppDialog

…

StatementService

…

SystemUI

Revert "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp"

2018-11-09 18:38:07 +00:00

VpnDialogs

Import translations. DO NOT MERGE

2018-11-02 07:38:29 -07:00

WallpaperBackup

…

WallpaperCropper

…

WAPPushManager

…