Jeff Sharkey 6d8edf0c10 am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 ...

* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
  Avoid airplane mode labels when Wi-Fi enabled.

2011-11-30 11:46:31 -08:00

..

BackupRestoreConfirmation

Import revised translations. DO NOT MERGE

2011-11-21 15:23:51 -08:00

DefaultContainerService

Import revised translations. DO NOT MERGE

2011-11-01 13:33:04 -07:00

SettingsProvider

resolved conflicts for merge of be6ab576 to ics-aah

2011-11-29 14:10:46 -08:00

SharedStorageBackup

Fix full backup of shared storage

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

SystemUI

am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1

2011-11-30 11:46:31 -08:00

VpnDialogs

Import revised translations. DO NOT MERGE

2011-11-01 13:33:04 -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