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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding