Selim Cinek e1fcf8edd6 Merge changes If96c0146,I0d68ad60 into oc-dev ...

am: 5393a0e2d9

Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de

2017-04-07 16:08:26 +00:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2017-04-01 21:49:26 -07:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2017-04-01 21:52:56 -07:00

CarrierDefaultApp

Merge "support notification channel for defaultcarrier app" into oc-dev

2017-04-05 17:52:23 +00:00

CompanionDeviceManager

Unbind from service on app killed and dedup association requests

2017-03-24 14:03:17 -07:00

CtsShim

…

DefaultContainerService

We really want f_frsize and f_bavail.

2017-04-02 23:33:38 -06:00

DocumentsUI

…

EasterEgg

…

ExternalStorageProvider

Merge "We really want f_frsize and f_bavail." into oc-dev

2017-04-03 17:27:48 +00:00

ExtServices

We really want f_frsize and f_bavail.

2017-04-02 23:33:38 -06:00

ExtShared

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

Import translations. DO NOT MERGE

2017-04-01 22:10:25 -07:00

Keyguard

Import translations. DO NOT MERGE

2017-04-01 22:19:25 -07:00

MtpDocumentsProvider

Import translations. DO NOT MERGE

2017-04-01 22:23:03 -07:00

Osu

Osu: temporarily comment out the usage of deprecated intent definitions

2017-03-13 11:21:13 -07:00

PrintRecommendationService

resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp

2017-04-06 20:25:45 -07:00

PrintSpooler

Make print failure notifications important

2017-04-05 16:46:50 -07:00

services

…

SettingsLib

Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev

2017-04-07 10:38:35 +00:00

SettingsProvider

Merge "Don't call the Package Manager when holding the settings lock" into oc-dev

2017-04-06 01:41:51 +00:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

2017-04-01 22:30:30 -07:00

StatementService

…

SystemUI

Merge changes If96c0146,I0d68ad60 into oc-dev

2017-04-07 16:08:26 +00:00

VpnDialogs

Import translations. DO NOT MERGE

2017-04-01 23:06:04 -07:00

WallpaperBackup

…

WallpaperCropper

…

WAPPushManager

…