# HG changeset patch
# User kbarrett
# Date 1473452664 14400
# Node ID ae24301482320a3084681e3e4f10915e2b85a339
# Parent  48b3e92a50a857312ee2105ea15467d3a776bc65
8165393: bad merge in java/lang/ref/package-info.java
Summary: Added the missing change.
Reviewed-by: rriggs

diff -r 48b3e92a50a8 -r ae2430148232 jdk/src/java.base/share/classes/java/lang/ref/package-info.java
--- a/jdk/src/java.base/share/classes/java/lang/ref/package-info.java	Fri Sep 09 12:07:49 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/ref/package-info.java	Fri Sep 09 16:24:24 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,7 @@
  * 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 pre-mortem cleanup actions in a more flexible way than
- * is possible with the Java finalization mechanism.
+ * scheduling post-mortem cleanup actions.
  * Post-mortem cleanup actions can be registered and managed by a
  * {@link java.lang.ref.Cleaner}.
  *