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

[maurizio.cimadamore at oracle.com]

Changeset: 32ab0aca1567
Author:    langtools
Date:      2017-05-04 19:22 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/32ab0aca1567

Automatic merge with constant-folding