Dianne Hackborn ed60f81940 resolved conflicts for merge of 76450622 to master ...

Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83

2011-06-02 09:20:52 -07:00

..

BackupRestoreConfirmation

Filter backup/restore confirmation buttons when obscured

2011-06-01 16:43:45 -07:00

DefaultContainerService

Import revised translations.

2011-05-26 15:34:01 -07:00

SettingsProvider

Restore from a previous full backup's tarfile

2011-06-01 15:09:55 -07:00

SystemUI

resolved conflicts for merge of 76450622 to master

2011-06-02 09:20:52 -07:00

WAPPushManager

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00