Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Thu, 07 Jan 2016 15:15:19 -0800
changeset 34870 8319ac454c80
parent 34868 816bdac2ddad (current diff)
parent 34869 42925eaf3e79 (diff)
child 34871 474a8e20f773
Merge
--- a/hotspot/src/share/vm/prims/jvm.cpp	Thu Jan 07 09:33:54 2016 -0800
+++ b/hotspot/src/share/vm/prims/jvm.cpp	Thu Jan 07 15:15:19 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
jdk-sandbox