tree c4c0172a6ac2261f70850be67a163d3cea58bb3a
parent b36d9a5a667366b852f2b7be6ab0f15b3add1907
parent 0c2aecb6210f9614fd209dcf13b6cdacba7db7eb
author Claudia de Veaux <deveaux@google.com> 1319159129 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1319159129 -0700

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