# HG changeset patch
# User jwilhelm
# Date 1490211409 -3600
# Node ID 563fba0728351d6e11a7bb5bdf8d14272d67d87f
# Parent  8b053ca26d6a6ddb547c54939eee8fbe8ab8bfaf# Parent  3720a014bb740984e678b8ef0c4b30d519745e00
Merge

diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/macosx/classes/com/apple/eawt/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/macosx/classes/com/apple/eio/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/applet/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/color/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/desktop/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/dnd/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/dnd/peer/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/event/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/font/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/geom/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/im/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/im/spi/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/image/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/image/renderable/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/peer/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/awt/print/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/java/beans/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/accessibility/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/event/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/metadata/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/plugins/bmp/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/spi/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/imageio/stream/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/print/attribute/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/print/event/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/print/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/sound/midi/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/sound/midi/spi/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/sound/sampled/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/border/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/event/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/filechooser/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/plaf/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/table/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/text/html/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/text/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/tree/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/src/java.desktop/share/classes/javax/swing/undo/package-info.java
diff -r 8b053ca26d6a -r 563fba072835 jdk/test/javax/swing/text/TableView/TableViewLayoutTest.java