Merge "Fix NPE in user settings." into nyc-dev

am: e69d754865

* commit 'e69d754865572edf40a59c0edbf657a0d7948865':
  Fix NPE in user settings.

Change-Id: I9eb1d38fb2b60a6c4937a99d58e91e4970454933

src/com/android/settings/users/UserSettings.java

@@ -751,6 +751,9 @@ public class UserSettings extends SettingsPreferenceFragment
                 }
                 pref.setTitle(user.name);
             }
+            if (pref == null) {
+                continue;
+            }
             if (!isInitialized(user)) {
                 if (user.isRestricted()) {
                     pref.setSummary(R.string.user_summary_restricted_not_set_up);