Bryce Lee fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev ...

Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960

2014-10-22 16:56:08 -07:00

..

BackupRestoreConfirmation

…

CaptivePortalLogin

…

DefaultContainerService

…

DocumentsUI

am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev

2014-10-13 22:04:06 +00:00

ExternalStorageProvider

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

…

Keyguard

Import translations. DO NOT MERGE

2014-10-19 10:56:51 -07:00

PrintSpooler

Import translations. DO NOT MERGE

2014-10-19 10:50:27 -07:00

services

…

SettingsProvider

resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev

2014-10-22 16:56:08 -07:00

SharedStorageBackup

…

Shell

Grant the shell user a permission to let apps host widgets.

2014-10-21 14:52:31 -07:00

SystemUI

am 55bc7dc4: am ccbeb61a: Block monkey from creating user profiles

2014-10-22 20:45:55 +00:00

VpnDialogs

…

WallpaperCropper

Merge "Fixed missing translation for wallpaper cropper" into lmp-dev

2014-10-10 21:14:34 +00:00

WAPPushManager

Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

2014-10-15 10:20:17 -07:00