am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.

Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'

* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.