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

[maurizio.cimadamore at oracle.com]

Changeset: ec7c214c126a
Author:    mcimadamore
Date:      2019-02-22 14:54 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/ec7c214c126a

Automatic merge with patterns-stage-1

! src/hotspot/share/classfile/classFileParser.cpp
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java