Ian Pedowitz 5eee5988c1 resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7

2017-06-07 19:54:21 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2017-05-30 22:47:23 -07:00

CaptivePortalLogin

Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4 am: 75faf02f04

2017-06-07 08:58:04 +00:00

CarrierDefaultApp

new strings to support vzw roaming feature

2017-06-02 18:18:21 -07:00

CompanionDeviceManager

Fix Companion UI crash on configuration change

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

CtsShim

…

DefaultContainerService

…

DocumentsUI

…

EasterEgg

…

ExternalStorageProvider

…

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 "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev

2017-06-07 23:25:57 +00:00

SettingsProvider

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

SharedStorageBackup

…

Shell

Merge "Enable wide color gamut rendering"

2017-06-02 20:07:56 +00:00

StatementService

…

SystemUI

resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp

2017-06-07 19:54:21 -07:00

SysuiDarkThemeOverlay

Change keyguard theme when wallpaper colors change

2017-06-01 12:14:53 -07:00

VpnDialogs

Import translations. DO NOT MERGE

2017-06-03 05:17:02 -07:00

WallpaperBackup

…

WallpaperCropper

…

WAPPushManager

…