tree bce5aa7b8159144a92b10b0d22f630c92e681c89
parent 10a9f35c954a6ee7cb58b6450846d08d59f22205
parent dc81c6d014bba6392730ed00e36518fb812946dc
author Roy West <rwest@google.com> 1253494608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253494608 -0700

am dc81c6d0: am 214dbb45: Fix bug2123514 and a handful of other string edits.

Merge commit 'dc81c6d014bba6392730ed00e36518fb812946dc'

* commit 'dc81c6d014bba6392730ed00e36518fb812946dc':
  Fix bug2123514 and a handful of other string edits.