hg: jdk9/sandbox/langtools: Merge

[paul.sandoz at oracle.com]

Changeset: e171872f0197
Author:    psandoz
Date:      2015-11-17 10:18 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/e171872f0197

Merge

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