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

[maurizio.cimadamore at oracle.com]

Changeset: fb4ec4a4e81f
Author:    langtools
Date:      2017-05-05 20:58 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/fb4ec4a4e81f

Automatic merge with constant-folding