hg: jdk7u/jdk7u/langtools: 2 new changesets

[lana.steuck at oracle.com]

Changeset: 9755f64a08e2
Author:    jfranck
Date:      2013-05-08 14:10 +0200
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/langtools/rev/9755f64a08e2

8013485: javac can't handle annotations with a <clinit> from a previous compilation unit
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/comp/Check.java
+ test/tools/javac/annotations/clinit/AnnoWithClinit1.java
+ test/tools/javac/annotations/clinit/AnnoWithClinitFail.java
+ test/tools/javac/annotations/clinit/AnnoWithClinitFail.out

Changeset: 20376611cb3b
Author:    lana
Date:      2014-11-20 14:01 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/langtools/rev/20376611cb3b

Merge