# HG changeset patch
# User amurillo
# Date 1444339736 25200
# Node ID 65de268ae879e5ba4a08327ff343ab14f6494027
# Parent  7616af8ec145d56fb5f228f99f44818630e8d7e9# Parent  c8a39258f28482b9840096cc288bdff721e9c6f1
Merge

diff -r 7616af8ec145 -r 65de268ae879 jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java
--- a/jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java	Thu Oct 08 17:03:07 2015 +0530
+++ b/jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java	Thu Oct 08 14:28:56 2015 -0700
@@ -28,8 +28,8 @@
 import java.lang.annotation.*;
 
 /**
- * The {@code @HotSpotIntrinsicCandidate} annotation is specific to the Oracle Java
- * HotSpot Virtual Machine implementation and indicates that an annotated method
+ * The {@code @HotSpotIntrinsicCandidate} annotation is specific to the
+ * HotSpot Virtual Machine. It indicates that an annotated method
  * may be (but is not guaranteed to be) intrinsified by the HotSpot VM. A method
  * is intrinsified if the HotSpot VM replaces the annotated method with hand-written
  * assembly and/or hand-written compiler IR -- a compiler intrinsic -- to improve