hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 09ab710722ce
Author:    mcimadamore
Date:      2017-10-02 18:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/09ab710722ce

Automatic merge with condy

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java