SharedPreferences and PreferenceActivity
Merge branch 'master' of github.com:android-samples/android-preferences