# HG changeset patch
# User duke
# Date 1499269814 -7200
# Node ID b2f9b98ad3e1628e384f677300a9e27911c4a609
# Parent  48766c0a793d62a5183abc32b4481dc13b72dd4d# Parent  d4f3fbdbd8af131137f52fa237b46ea1223e4548
Merge

diff -r 48766c0a793d -r b2f9b98ad3e1 .hgtags-top-repo
--- a/.hgtags-top-repo	Thu Sep 08 16:59:21 2011 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 17:50:14 2017 +0200
@@ -125,3 +125,4 @@
 f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
 69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
 587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
+0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
diff -r 48766c0a793d -r b2f9b98ad3e1 hotspot/.hgtags
--- a/hotspot/.hgtags	Thu Sep 08 16:59:21 2011 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 17:50:14 2017 +0200
@@ -177,3 +177,4 @@
 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
 3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03
+0fa3ace511fe98fe948e751531f3e2b7c60c8376 jdk8-b04
diff -r 48766c0a793d -r b2f9b98ad3e1 jdk/.hgtags
--- a/jdk/.hgtags	Thu Sep 08 16:59:21 2011 -0700
+++ b/jdk/.hgtags	Wed Jul 05 17:50:14 2017 +0200
@@ -125,3 +125,4 @@
 2cdbbc4a63592be7f1556fffe37b1253a77bd481 jdk8-b01
 13e70aa1398eb959c54bc68b783ca0eef1286ad2 jdk8-b02
 7989ee9fe673a87f4db3917fa6a005732a6a9b85 jdk8-b03
+fc569517f3cf242f90ce3503b743eb5553938946 jdk8-b04
diff -r 48766c0a793d -r b2f9b98ad3e1 jdk/src/share/classes/java/lang/VirtualMachineError.java
--- a/jdk/src/share/classes/java/lang/VirtualMachineError.java	Thu Sep 08 16:59:21 2011 -0700
+++ b/jdk/src/share/classes/java/lang/VirtualMachineError.java	Wed Jul 05 17:50:14 2017 +0200
@@ -3,7 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, asP
+ * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Oracle in the LICENSE file that accompanied this code.