hg: jdk7u/jdk7u/langtools: 3 new changesets

[michael.fang at oracle.com]

Changeset: 287aa207df3e
Author:    jjh
Date:      2012-06-01 14:55 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/langtools/rev/287aa207df3e

7159016: Static import of member in processor-generated class fails in JDK 7
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+ test/tools/javac/T7159016.java

Changeset: ebcacb329bd3
Author:    mfang
Date:      2012-06-12 13:08 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/langtools/rev/ebcacb329bd3

7175367: NLS: 7u6 message drop10 integration
Reviewed-by: yhuang

! src/share/classes/com/sun/tools/apt/resources/apt_ja.properties
! src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties
! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
! src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
! src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties

Changeset: 35b2699c6243
Author:    mfang
Date:      2012-06-12 16:52 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/langtools/rev/35b2699c6243

Merge