Jason Monk 0b2e1ca525 Merge "resolve merge conflicts of 6c16d44 to master"

2016-05-31 16:24:44 +00:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2016-05-30 16:03:16 -07:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2016-05-21 18:16:25 -07:00

CtsShim

Don't pre-opt shims

2016-05-03 11:11:39 -07:00

DefaultContainerService

Import translations. DO NOT MERGE

2016-05-03 23:15:27 -07:00

DocumentsUI

Merge "Fix two confusing naming issues"

2016-05-31 13:56:39 +00:00

ExternalStorageProvider

…

ExtServices

Do not bundle cross user.

2016-05-11 10:59:53 -04:00

ExtShared

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

Import translations. DO NOT MERGE

2016-05-22 23:45:18 -07:00

Keyguard

Import translations. DO NOT MERGE

2016-05-30 16:24:55 -07:00

MtpDocumentsProvider

Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1 am: 6fdaf2f2cf

2016-05-13 17:42:44 +00:00

Osu

…

PrintRecommendationService

Move Xerox recommendation plugin to service.

2016-05-27 15:32:19 -07:00

PrintSpooler

Merge "Allow to select range unless we are finishing"

2016-05-31 16:08:47 +00:00

services

…

SettingsLib

Import translations. DO NOT MERGE

2016-05-30 11:59:18 -07:00

SettingsProvider

Import translations. DO NOT MERGE

2016-05-23 05:28:34 -07:00

SharedStorageBackup

…

Shell

Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e

2016-05-24 18:11:46 +00:00

StatementService

…

SystemUI

resolve merge conflicts of 6c16d44 to master

2016-05-31 11:43:54 -04:00

VpnDialogs

Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: d6d2497ebe

2016-05-31 10:12:13 +00:00

WallpaperBackup

…

WallpaperCropper

…

WAPPushManager

…