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

[maurizio.cimadamore at oracle.com]

Changeset: 9ceda87e8df1
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/9ceda87e8df1

Automatic merge with constant-folding