Andrew Sapperstein da26da973b resolve merge conflicts of 83b1a18 to master ...

Change-Id: Ibbb4f9cff0224fb4ca3607f60a4ed9d6fafe8216

2016-06-21 13:56:01 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2016-06-03 03:43:29 -07:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2016-06-06 13:42:30 -07:00

CtsShim

Update CTS shims

2016-06-14 12:46:34 -07:00

DefaultContainerService

Import translations. DO NOT MERGE

2016-06-03 03:57:53 -07:00

DocumentsUI

Import translations. DO NOT MERGE

2016-06-20 22:37:46 -07:00

ExternalStorageProvider

…

ExtServices

…

ExtShared

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

Import translations. DO NOT MERGE

2016-06-06 13:55:54 -07:00

Keyguard

Import translations. DO NOT MERGE

2016-06-20 22:50:28 -07:00

MtpDocumentsProvider

Fix warning from error prone.

2016-06-08 16:21:06 +09:00

Osu

Fixed binding issue.

2016-06-08 01:02:10 +00:00

PrintRecommendationService

Merge \\\"Version PrintRecommendationService.\\\" into nyc-dev am: 8e3a16ad91 am: c6ded5559c

2016-06-14 22:57:05 +00:00

PrintSpooler

Import translations. DO NOT MERGE

2016-06-20 22:53:02 -07:00

services

…

SettingsLib

resolve merge conflicts of 83b1a18 to master

2016-06-21 13:56:01 -07:00

SettingsProvider

Merge \\\"Fix a race in local settings caches\\\" into nyc-dev am: f4ddb7ce30 am: ee4c0a3c7e

2016-06-18 02:29:12 +00:00

SharedStorageBackup

…

Shell

Merge \\\"Reduce shell power over user management.\\\" into nyc-dev am: 1b4124fc95 am: 0979d718c5

2016-06-10 21:59:26 +00:00

StatementService

…

SystemUI

resolve merge conflicts of 83b1a18 to master

2016-06-21 13:56:01 -07:00

VpnDialogs

Import translations. DO NOT MERGE

2016-06-03 06:09:07 -07:00

WallpaperBackup

…

WallpaperCropper

…

WAPPushManager

…