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

[maurizio.cimadamore at oracle.com]

Changeset: b3b50e7ad342
Author:    mcimadamore
Date:      2019-08-20 09:05 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/b3b50e7ad342

Automatic merge with patterns-stage-1

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