am eba188e2: am aa0a3b09: Merge change 22944 into eclair

Merge commit 'eba188e21c752d98f03215eb15822bd39c462664'

* commit 'eba188e21c752d98f03215eb15822bd39c462664':
  Various tweaks to try to improve low memory behavior.

core/java/android/view/ViewRoot.java

@@ -1292,6 +1292,11 @@ public final class ViewRoot extends Handler implements ViewParent,
             // TODO: we should ask the window manager to do something!
             // for now we just do nothing
             return;
+        } catch (IllegalArgumentException e) {
+            Log.e("ViewRoot", "IllegalArgumentException locking surface", e);
+            // TODO: we should ask the window manager to do something!
+            // for now we just do nothing
+            return;
         }
 
         try {