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

[maurizio.cimadamore at oracle.com]

Changeset: 69b01f28c1cb
Author:    langtools
Date:      2017-05-04 16:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/69b01f28c1cb

Automatic merge with constant-folding