Dianne Hackborn 3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master ...

Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6

2011-06-14 16:13:26 -07:00

..

BackupRestoreConfirmation

Don't ack/nak backup redundantly at exit

2011-06-07 15:35:45 -07:00

DefaultContainerService

Import revised translations.

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

SettingsProvider

Settings: Remove unused USE_PTP_INTERFACE setting

2011-06-13 22:21:01 -04:00

SharedStorageBackup

Implement shared-storage full backup/restore

2011-06-07 12:16:27 -07:00

SystemUI

resolved conflicts for merge of e95c07bd to master

2011-06-14 16:13:26 -07:00

VpnDialogs

The UI part of the user space VPN support.

2011-06-03 17:06:29 -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