am 90b3135d: am 4d672988: Merge "Remove "StringTest.java"." into gingerbread

Merge commit '90b3135d8b2471990412d79dce4ee6390118d8d3'

* commit '90b3135d8b2471990412d79dce4ee6390118d8d3':
  Remove "StringTest.java".