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

[maurizio.cimadamore at oracle.com]

Changeset: d891a96f7370
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/d891a96f7370

Automatic merge with constant-folding