Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp * commit '4d672988fed7fbdd887fe78603fa2eaf713031ad': Remove "StringTest.java".
Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp * commit '4d672988fed7fbdd887fe78603fa2eaf713031ad': Remove "StringTest.java".