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

[maurizio.cimadamore at oracle.com]

Changeset: 2bef1947d325
Author:    langtools
Date:      2017-05-05 16:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/2bef1947d325

Automatic merge with constant-folding