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

[maurizio.cimadamore at oracle.com]

Changeset: c6d0d37398a8
Author:    langtools
Date:      2017-05-12 21:23 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/c6d0d37398a8

Automatic merge with constant-folding