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

Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'

* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
  Fix some bugs in SettingsProvider that I introduced the other day.