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

[maurizio.cimadamore at oracle.com]

Changeset: 8c89a29b40aa
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:52 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/8c89a29b40aa

Automatic merge with constant-folding