hg: amber/amber/jaxp: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: c8975285354e
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:37 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/c8975285354e

Automatic merge with constant-folding