Dan Albert b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp ...

Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9

2014-11-12 13:24:42 -08:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2014-10-30 15:42:25 -07:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2014-10-30 15:22:59 -07:00

DefaultContainerService

…

DocumentsUI

Import translations. DO NOT MERGE

2014-10-30 15:19:47 -07:00

ExternalStorageProvider

Import translations. DO NOT MERGE

2014-10-30 15:21:21 -07:00

FakeOemFeatures

…

FusedLocation

…

InputDevices

Import translations. DO NOT MERGE

2014-10-30 13:12:29 -07:00

Keyguard

am 5b560f57: am 29685c2f: Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev

2014-11-12 16:20:20 +00:00

PrintSpooler

am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev

2014-11-01 00:27:30 +00:00

services

Move frameworks/base over to libc++.

2014-11-12 11:22:20 -08:00

SettingsProvider

Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f

2014-11-12 03:12:51 +00:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

2014-10-30 13:17:29 -07:00

SystemUI

am 1419db40: am 89444a38: Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev

2014-11-12 16:33:24 +00:00

VpnDialogs

Import translations. DO NOT MERGE

2014-10-30 15:33:23 -07:00

WallpaperCropper

am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"

2014-10-17 14:59:48 +00:00

WAPPushManager

Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

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