am f1b02c8b: am 904bc315: Merge "Fix NPE in Display Settings." into jb-dev

* commit 'f1b02c8b1ae346bc27172595a8ccc9494849f10a':
  Fix NPE in Display Settings.

src/com/android/settings/DisplaySettings.java

@@ -236,6 +236,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
     }
 
     private void updateAccelerometerRotationCheckbox() {
+        if (getActivity() == null) return;
         mAccelerometer.setChecked(Settings.System.getInt(
                 getContentResolver(),
                 Settings.System.ACCELEROMETER_ROTATION, 0) != 0);