changeset 9898:6f9765435e74

Merge
author amurillo
date Tue, 12 Jan 2016 11:31:47 -0800
parents 2794bc7859f5 9f45d3d57d69
children 410b21b80b92
files src/share/vm/prims/jvm.cpp
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 07 21:10:28 2016 +0000
+++ b/.hgtags	Tue Jan 12 11:31:47 2016 -0800
@@ -502,3 +502,4 @@
 de592ea5f7ba0f8a8c5afc03bd169f7690c72b6f jdk-9+97
 e5b1a23be1e105417ba1c4c576ab373eb3fa2c2b jdk-9+98
 f008e8cc10d5b3212fb22d58c96fa01d38654f19 jdk-9+99
+bdb0acafc63c42e84d9d8195bf2e2b25ee9c3306 jdk-9+100
--- a/src/share/vm/prims/jvm.cpp	Thu Jan 07 21:10:28 2016 +0000
+++ b/src/share/vm/prims/jvm.cpp	Tue Jan 12 11:31:47 2016 -0800
@@ -285,7 +285,7 @@
   return os::javaTimeNanos();
 JVM_END
 
-// The function below is actually exposed by sun.misc.VM and not
+// The function below is actually exposed by jdk.internal.misc.VM and not
 // java.lang.System, but we choose to keep it here so that it stays next
 // to JVM_CurrentTimeMillis and JVM_NanoTime