Jason Monk 90a788e29b resolve merge conflicts of d70ed99 to master ...

Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a

2016-08-30 10:54:03 -04:00

..

BackupRestoreConfirmation

…

CaptivePortalLogin

Import translations. DO NOT MERGE

2016-08-19 17:38:54 -07:00

CtsShim

…

DefaultContainerService

…

DocumentsUI

DO NOT MERGE: Don't create DocumentInfo instances in background. am: b818058f4e

2016-08-24 20:00:50 +00:00

EasterEgg

…

ExternalStorageProvider

Lowercasing search query in ExternalStorageProvider#querySearchDocs. am: b56e9213ce am: 661948b8f0

2016-08-19 23:10:17 +00:00

ExtServices

…

ExtShared

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

…

Keyguard

Fix a flicker when returning to the lockscreen am: d11d1a9486 am: afaf4ac7a9

2016-08-18 00:17:02 +00:00

MtpDocumentsProvider

Set Root.FLAG_LOCAL_ONLY for MTP roots. am: b7573e93cd

2016-08-23 17:20:43 +00:00

Osu

…

PrintRecommendationService

…

PrintSpooler

Import translations. DO NOT MERGE

2016-08-19 18:06:27 -07:00

services

…

SettingsLib

Adding flags to allow package names to be sent to support. am: e1398ea4d9 am: a95de6b96d am: 48e12f65e8

2016-08-26 22:29:37 +00:00

SettingsProvider

Merge "Polish MemoryIntArray"

2016-08-29 21:26:42 +00:00

SharedStorageBackup

…

Shell

Migrate BugreportReceiverTest to JUnit 4.

2016-08-12 16:47:44 -07:00

StatementService

…

SystemUI

resolve merge conflicts of d70ed99 to master

2016-08-30 10:54:03 -04:00

VpnDialogs

Import translations. DO NOT MERGE

2016-08-19 18:36:00 -07:00

WallpaperBackup

Properly configure live wallpaper selection following restore

2016-08-24 16:23:20 -07:00

WallpaperCropper

…

WAPPushManager

…