merge from open-source master

Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0

core/java/android/webkit/WebView.java

@@ -3831,6 +3831,16 @@ public class WebView extends AbsoluteLayout
             }
         }
 
+        if (keyCode == KeyEvent.KEYCODE_PAGE_UP) {
+            pageUp(false);
+            return true;
+        }
+
+        if (keyCode == KeyEvent.KEYCODE_PAGE_DOWN) {
+            pageDown(false);
+            return true;
+        }
+
         if (keyCode >= KeyEvent.KEYCODE_DPAD_UP
                 && keyCode <= KeyEvent.KEYCODE_DPAD_RIGHT) {
             switchOutDrawHistory();