Jason Simmons 3b282fae37 resolved conflicts for merge of 0c0120ef to ics-aah ...

Change-Id: If1f39ff160b4305ef057d50bb1f01d2c45f1579d

2011-12-06 11:11:13 -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 0c0120ef to ics-aah

2011-12-06 11:11:13 -08:00

SharedStorageBackup

Fix full backup of shared storage

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

SystemUI

am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1

2011-12-05 19:04:12 -08:00

VpnDialogs

Import revised translations. DO NOT MERGE

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

WAPPushManager

…