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

[maurizio.cimadamore at oracle.com]

Changeset: a9d3205413a3
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/a9d3205413a3

Automatic merge with constant-folding