Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev

Author: George Mount

core/java/android/webkit/CallbackProxy.java

@@ -736,6 +736,14 @@ public void onClick(
                                                 res.cancel();
                                             }
                                         })
+                                .setOnCancelListener(
+                                        new DialogInterface.OnCancelListener() {
+                                            @Override
+                                            public void onCancel(
+                                                    DialogInterface dialog) {
+                                                res.cancel();
+                                            }
+                                        })
                                 .show();
                     }
                     receiver.setReady();