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

[maurizio.cimadamore at oracle.com]

Changeset: 250e3361f2af
Author:    langtools
Date:      2017-05-11 18:53 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/250e3361f2af

Automatic merge with constant-folding