Robert Greenwalt c1b3cbe164 resolved conflicts for merge of ea54b760 to master ...

Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8

2011-11-09 09:03:59 -08:00

..

BackupRestoreConfirmation

Import revised translations.

2011-11-02 09:41:15 -07:00

DefaultContainerService

Import revised translations.

2011-11-02 09:41:15 -07:00

SettingsProvider

Merge "Wimax : wimax framework related open source." into ics-mr1

2011-11-08 10:01:07 -08:00

SharedStorageBackup

Fix full backup of shared storage

2011-10-18 15:47:59 -07:00

SystemUI

resolved conflicts for merge of ea54b760 to master

2011-11-09 09:03:59 -08:00

VpnDialogs

Import revised translations.

2011-11-02 09:41:15 -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