hg: amber/amber: Automatic merge with datum

[maurizio.cimadamore at oracle.com]

Changeset: 62f972dd087f
Author:    mcimadamore
Date:      2018-10-05 23:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/62f972dd087f

Automatic merge with datum

! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java