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

[maurizio.cimadamore at oracle.com]

Changeset: f6a80788dc08
Author:    mcimadamore
Date:      2019-07-11 12:45 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/f6a80788dc08

Automatic merge with patterns-stage-1

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java