Jason Monk 826b6094a7 resolve merge conflicts of 1a5e87918e to oc-mr1-dev-plus-aosp ...

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

2017-08-29 11:30:52 -04:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2017-08-15 14:05:05 -07:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2017-08-15 14:11:53 -07:00

CarrierDefaultApp

Import translations. DO NOT MERGE

2017-08-15 14:19:07 -07:00

CompanionDeviceManager

[Companion] Fix NPE due to looking up view btoo soon

2017-07-27 21:25:54 +00:00

CtsShim

…

DefaultContainerService

Import translations. DO NOT MERGE

2017-08-15 14:27:20 -07:00

DocumentsUI

…

EasterEgg

…

ExternalStorageProvider

Import translations. DO NOT MERGE

2017-08-15 14:34:24 -07:00

ExtServices

…

ExtShared

…

FakeOemFeatures

…

FusedLocation

Import translations. DO NOT MERGE

2017-08-15 14:41:38 -07:00

InputDevices

Import translations. DO NOT MERGE

2017-08-24 05:11:32 -07:00

Keyguard

…

MtpDocumentsProvider

Import translations. DO NOT MERGE

2017-08-15 14:56:40 -07:00

Osu

…

Osu2

…

overlays/SysuiDarkThemeOverlay

…

PrintRecommendationService

…

PrintSpooler

Import translations. DO NOT MERGE

2017-08-15 15:05:13 -07:00

services

…

SettingsLib

Merge "Bluetooth: Add developer options to show devices without names" into oc-mr1-dev

2017-08-26 02:51:31 +00:00

SettingsProvider

Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev

2017-08-23 01:04:55 +00:00

SharedStorageBackup

…

Shell

Merge "Add wifi permissions to shell" into oc-mr1-dev

2017-08-24 22:47:29 +00:00

StatementService

…

SystemUI

resolve merge conflicts of 1a5e87918e to oc-mr1-dev-plus-aosp

2017-08-29 11:30:52 -04:00

VpnDialogs

Import translations. DO NOT MERGE

2017-08-15 17:50:37 -07:00

WallpaperBackup

…

WallpaperCropper

…

WAPPushManager

…