tree 94083a06190a9e2adf0150d1e11ef3addf173541
parent 003736851fb837c783db7ee2ae8f80b0fc836b5c
parent e1a84b31d5945c4690b25d3c86ee82bfa9278bb8
author Eric Fischer <enf@google.com> 1285623560 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285623560 -0700

am e1a84b31: (-s ours) am d50b3d13: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit 'e1a84b31d5945c4690b25d3c86ee82bfa9278bb8'

* commit 'e1a84b31d5945c4690b25d3c86ee82bfa9278bb8':
  Trim unwanted whitespace from translations.  DO NOT MERGE