Narayan Kamath bd613068a3 resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp ...

Change-Id: Ib895c959b7403f959f326881a1dea4b81dda73e3

2015-05-29 10:58:32 +01:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-05-14 01:25:41 -07:00

CaptivePortalLogin

Don't leak NetworkListens in captive portal app.

2015-05-18 12:48:28 -04:00

DefaultContainerService

…

DocumentsUI

am 7a3b2012: Merge "Ensure that the copy notification is always cancelable." into mnc-dev

2015-05-27 21:34:10 +00:00

ExternalStorageProvider

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

am e8d735c7: Merge "Remove all_modules\'s dependency on keymaps validation."

2015-05-06 22:56:04 +00:00

Keyguard

am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

2015-05-27 20:23:05 +00:00

PrintSpooler

am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

2015-05-27 20:23:30 +00:00

services

…

SettingsLib

Fix display of "null" string shown in Wifi Settings for AP.

2015-05-28 10:41:14 -07:00

SettingsProvider

am eff64986: Merge "Do not call out of the settings provider with a lock held" into mnc-dev

2015-05-21 00:45:41 +00:00

SharedStorageBackup

Add full backup criteria to android manifest

2015-05-03 16:19:27 -07:00

Shell

am 2177ed40: Merge changes from topic \'bench\' into mnc-dev

2015-05-15 22:08:51 +00:00

StatementService

Update Statement Service

2015-05-22 14:07:32 -04:00

SystemUI

resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp

2015-05-29 10:58:32 +01:00

VpnDialogs

Support cross-user VPN calls (with permission)

2015-05-18 23:35:31 +01:00

WallpaperCropper

DayNight theme for framework packages

2015-05-05 14:09:21 -07:00

WAPPushManager

…