hg: jdk9/sandbox/jdk: Merge

[xueming.shen at oracle.com]

Changeset: 5131eaf0f4dd
Author:    sherman
Date:      2015-01-24 00:30 +0000
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/5131eaf0f4dd

Merge

! src/java.base/share/classes/java/lang/String.java