hg: amber/amber: Automatic merge with patterns-stage-1

[maurizio.cimadamore at oracle.com]

Changeset: 6b7f7f6a1ba6
Author:    mcimadamore
Date:      2019-01-31 22:09 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/6b7f7f6a1ba6

Automatic merge with patterns-stage-1

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
- test/hotspot/jtreg/gc/g1/TestStringTableStats.java
- test/langtools/jdk/javadoc/doclet/testHtmlWarning/TestHtmlWarning.java
! test/langtools/tools/javac/lib/DPrinter.java