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

[maurizio.cimadamore at oracle.com]

Changeset: e101c428417a
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-30 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/e101c428417a

Automatic merge with constant-folding

- test/tools/javac/modules/LegacyXModuleTest.java