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

[maurizio.cimadamore at oracle.com]

Changeset: e679d894d76c
Author:    mcimadamore
Date:      2019-01-23 22:46 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/e679d894d76c

Automatic merge with patterns-stage-1

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties