hg: tiered-attrib/dev/langtools: fixing a merge bug at Infer.ImplicitArgType

[vicente.romero at oracle.com]

Changeset: 9ab5de462f56
Author:    vromero
Date:      2015-03-24 15:53 -0700
URL:       http://hg.openjdk.java.net/tiered-attrib/dev/langtools/rev/9ab5de462f56

fixing a merge bug at Infer.ImplicitArgType

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