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

[maurizio.cimadamore at oracle.com]

Changeset: 940847fa8d28
Author:    langtools
Date:      2017-05-11 01:48 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/940847fa8d28

Automatic merge with constant-folding

- src/java.base/share/classes/sun/security/ssl/EllipticCurvesExtension.java