tree d7592713e97d30def1175644f5c22f639cef521b
parent 07bc0847b9c110d1f7f08f76c6686d9a38539553
parent 472cd63868616bf3a8493484794356a1616a22c6
author Claudia de Veaux <deveaux@google.com> 1319159260 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319159260 -0700

am 472cd638: Merge "String scrub to bring to punc, wording, etc. standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"

* commit '472cd63868616bf3a8493484794356a1616a22c6':
  String scrub to bring to punc, wording, etc. standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328