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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding