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

[maurizio.cimadamore at oracle.com]

Changeset: 2aba11a51655
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-30 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/2aba11a51655

Automatic merge with constant-folding