Dianne Hackborn 6b592723c9 resolved conflicts for merge of f51ded0f to master ...

Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2

2011-06-10 12:45:36 -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

am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE

2011-06-09 11:55:30 -07:00

SharedStorageBackup

Implement shared-storage full backup/restore

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

SystemUI

resolved conflicts for merge of f51ded0f to master

2011-06-10 12:45:36 -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