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

[maurizio.cimadamore at oracle.com]

Changeset: 7fbbf24fc671
Author:    langtools
Date:      2017-05-05 20:58 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/7fbbf24fc671

Automatic merge with constant-folding