am aeb7b571: am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev

* commit 'aeb7b5710593b982d2306eb2006b6ae153655141':
  Fix NPE in Dreams settings.

src/com/android/settings/DreamComponentPreference.java

@@ -80,7 +80,9 @@ public class DreamComponentPreference extends Preference {
                 ServiceManager.getService("dreams"));
         try {
             cn = dm.getDreamComponent();
-        } catch (RemoteException ex) {
+        } catch (RemoteException ex) { }
+
+        if (cn == null) {
             setSummary("(unknown)");
             return;
         }