Merge "Fix amnesia problem in MultiSelectListPreference." into jb-dev

Author: Amith Yamasani

core/java/android/preference/MultiSelectListPreference.java

@@ -125,8 +125,9 @@ public CharSequence[] getEntryValues() {
      * @param values The values to set for the key.
      */
     public void setValues(Set<String> values) {
-        mValues = values;
-        
+        mValues.clear();
+        mValues.addAll(values);
+
         persistStringSet(values);
     }