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

[maurizio.cimadamore at oracle.com]

Changeset: 4f35b4821327
Author:    langtools
Date:      2017-05-04 16:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/4f35b4821327

Automatic merge with constant-folding