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

[maurizio.cimadamore at oracle.com]

Changeset: 12a4e8e307ee
Author:    langtools
Date:      2017-05-04 16:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/12a4e8e307ee

Automatic merge with constant-folding