Chris Wren d8a9a77537 am f66bf0e8: am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev ...

* commit 'f66bf0e86790e5864bb018b2fa778456ea561e68':
  resolve conflicting assumptions from the merge.

2012-10-11 17:52:35 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2012-10-03 19:38:55 -07:00

DefaultContainerService

Migrate more Secure settings to Global.

2012-09-27 16:22:53 -07:00

FakeOemFeatures

Refactor for multi-display support.

2012-08-19 22:42:08 -07:00

FusedLocation

Revert "Changes to support updating location providers."

2012-10-05 02:32:52 -05:00

InputDevices

…

SettingsProvider

Defer wifi bounce following restore for 1 minute...

2012-10-09 15:11:01 -07:00

SharedStorageBackup

…

SystemUI

am f66bf0e8: am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev

2012-10-11 17:52:35 -07:00

VpnDialogs

Migrate legacy VPN arguments to system_server.

2012-08-24 11:29:58 -07:00

WAPPushManager

…