base

SettingsProvider: Fix botched merge from donut to eclair.

donut and eclair had different ideas of what it means to upgrade from verion 34 to 35.

Signed-off-by: Mike Lockwood <lockwood@android.com>