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

[maurizio.cimadamore at oracle.com]

Changeset: 1ae6950644db
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/1ae6950644db

Automatic merge with constant-folding