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

[maurizio.cimadamore at oracle.com]

Changeset: e670abea166a
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:37 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/e670abea166a

Automatic merge with constant-folding