# HG changeset patch # User lana # Date 1452208519 28800 # Node ID 8319ac454c80be0b9f3ca8f9b4a2a776a538c9b3 # Parent 816bdac2ddad7d57cb19722d06769801be1b0cf2# Parent 42925eaf3e7973ce5846a10bec79ad6836cb921f Merge diff -r 816bdac2ddad -r 8319ac454c80 hotspot/src/share/vm/prims/jvm.cpp --- 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