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