Andrew Sapperstein 6b77f8126f resolve merge conflicts of bc2ba56 to master ...

Change-Id: Ie7c1ba0704e392efc6122a8addb6c082680a7c2e

2016-07-03 15:36:00 -04:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2016-06-23 13:52:13 -07:00

CaptivePortalLogin

…

CtsShim

Update prebuilts from build server

2016-06-22 09:39:49 -07:00

DefaultContainerService

…

DocumentsUI

resolve merge conflicts of bc2ba56 to master

2016-07-03 15:36:00 -04:00

EasterEgg

add neko metrics

2016-06-30 08:06:53 -04:00

ExternalStorageProvider

Provider-level changes for implementing direct eject of a root in Files app.

2016-06-29 23:06:51 +00:00

ExtServices

…

ExtShared

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

…

Keyguard

Merge "Revert "Build SystemUI and Keyguard with AAPT2""

2016-07-01 21:28:10 +00:00

MtpDocumentsProvider

Import translations. DO NOT MERGE

2016-06-29 12:36:34 -07:00

Osu

…

PrintRecommendationService

…

PrintSpooler

Merge \\"Prevent PrintRegistry callbacks when finishing\\" into nyc-mr1-dev am: 4b24c48e23

2016-07-01 16:04:35 +00:00

services

…

SettingsLib

Merge "Import translations. DO NOT MERGE"

2016-06-30 14:21:20 +00: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

…

StatementService

…

SystemUI

Merge \"Merge \\"Always send task stack change updates if PiP is enabled\\" into nyc-mr1-dev am: 4ce6754e60\" into nyc-mr1-dev-plus-aosp

2016-07-01 22:09:38 +00:00

VpnDialogs

…

WallpaperBackup

Fix adb backup/restore

2016-06-22 13:53:41 -07:00

WallpaperCropper

…

WAPPushManager

…