am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I...
am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread
Merge commit '603a1f59'
* commit '603a1f59':
Fix some bugs in SettingsProvider that I introduced the other day.