tree f0c3a108fc4d1012e233a17528e2059171154f94
parent f739444694a8378142250f930bc575f9628d7ace
parent d50b3d1388577370cfe61c34b238cb6c245667a8
author Eric Fischer <enf@google.com> 1285615870 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285615870 -0700

am d50b3d13: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit 'd50b3d1388577370cfe61c34b238cb6c245667a8' into gingerbread-plus-aosp

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