hs/jdk changeset 13440 contains a bad merge in java/lang/ref/package-info.java.

--- a/src/java.base/share/classes/java/lang/ref/package-info.java Mon Jan 04 13:49:11 2016 +0100
+++ b/src/java.base/share/classes/java/lang/ref/package-info.java Thu Jan 07 20:06:51 2016 +0000
@@ -43,7 +43,10 @@
  * implementing memory-sensitive caches, weak references are for
  * implementing canonicalizing mappings that do not prevent their keys
  * (or values) from being reclaimed, and phantom references are for
- * scheduling post-mortem cleanup actions.
+ * scheduling pre-mortem cleanup actions in a more flexible way than
+ * is possible with the Java finalization mechanism.
+ * Post-mortem cleanup actions can be registered and managed by a
+ * {@link java.lang.ref.Cleaner}.
  *
  * <p> Each reference-object type is implemented by a subclass of the
  * abstract base {@link java.lang.ref.Reference} class.

8138696 (pushed in dev forest) added the sentence
+ * Post-mortem cleanup actions can be registered and managed by a
+ * {@link java.lang.ref.Cleaner}.

8071507 (pushed in hotspot forest) made the change
- * scheduling pre-mortem cleanup actions in a more flexible way than
- * is possible with the Java finalization mechanism.
+ * scheduling post-mortem cleanup actions.

When the forests were merged, only the change from 8138696 was retained, while the change from 8071507 was discarded. Both changes should have been retained.