diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index ad48786..93b3429 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -303,9 +303,9 @@
     
     public String toString() {
         StringBuilder sb = new StringBuilder(128);
-        sb.append("{ fnt=");
+        sb.append("{");
         sb.append(fontScale);
-        sb.append(" imsi=");
+        sb.append("x imsi=");
         sb.append(mcc);
         sb.append("/");
         sb.append(mnc);
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index 9d00d02..8f7bb8c 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -396,6 +396,12 @@
             LocalPowerManager powerManager);
 
     /**
+     * Called by window manager once it has the initial, default native
+     * display dimensions.
+     */
+    public void setInitialDisplaySize(int width, int height);
+    
+    /**
      * Check permissions when adding a window.
      * 
      * @param attrs The window's LayoutParams.