-b master f6a34dd6ab resolved conflicts for merge of b7195159 to master

2009-07-06 17:44:41 -07:00

..

DatabaseHelper.java

resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -07:00

SettingsBackupAgent.java

Restore GPS state and ringer/vibrate toggles.

2009-07-06 17:18:46 -07:00

SettingsHelper.java

resolved conflicts for merge of b7195159 to master

2009-07-06 17:44:41 -07:00

SettingsProvider.java

Revert "hand rolled out 220f4d633b due to interface changes on master, the change will need to be made again"

2009-07-06 14:05:11 -07:00