Jeff Brown 7218d830e2 resolved conflicts for merge of ca2b552d to master ...

Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b

2011-06-03 15:50:27 -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

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

SystemUI

resolved conflicts for merge of b9e2f68b to master

2011-06-03 14:15:10 -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