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

[maurizio.cimadamore at oracle.com]

Changeset: 11fa9f4fcbc4
Author:    langtools
Date:      2017-05-12 01:28 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/11fa9f4fcbc4

Automatic merge with constant-folding