Jason Monk afeefb63c6 am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev ...

automerge: 3454612

* commit '3454612e2c0879ece4ac17c8b7ba93dce59b1907':
  Avoid showing emergency calls when not possible

2015-01-12 16:28:02 +00:00

..

BackupRestoreConfirmation

…

CaptivePortalLogin

am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae

2014-12-17 18:43:36 +00:00

DefaultContainerService

…

DocumentsUI

…

ExternalStorageProvider

…

FakeOemFeatures

…

FusedLocation

…

InputDevices

…

Keyguard

Import translations. DO NOT MERGE

2014-12-22 20:26:50 -08:00

PrintSpooler

…

services

…

SettingsProvider

am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev

2015-01-09 20:20:01 +00:00

SharedStorageBackup

…

Shell

…

SystemUI

am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev

2015-01-12 16:28:02 +00:00

VpnDialogs

…

WallpaperCropper

…

WAPPushManager

…