hg: jdk9/sandbox/langtools: Merge

[paul.sandoz at oracle.com]

Changeset: 9013ee60c635
Author:    psandoz
Date:      2015-07-31 12:42 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/9013ee60c635

Merge

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