Svetoslav Ganov ca34bcf674 resolved conflicts for merge of 80c904df to jb-mr1-dev ...

Change-Id: Ic2f8d64cd716d04a533ca0685d1fb0d5e2a21933

2012-08-16 12:22:23 -07:00

..

DatabaseHelper.java

resolved conflicts for merge of 80c904df to jb-mr1-dev

2012-08-16 12:22:23 -07:00

SettingsBackupAgent.java

Merge restored wifi APs, don't overwrite

2012-05-15 17:18:22 -07:00

SettingsHelper.java

Power manager rewrite.

2012-08-15 03:06:24 -07:00

SettingsProvider.java

Support enabling WAL using a flag when DB is opened.

2012-03-23 13:26:26 -07:00