tree 28d86a677b683e3fdf5c77ce99ed541edfa522c7
parent 2e86b2df0584e314990074081777d1e4844d71f6
parent 7063eb104657d1fa3f5e030b4657a9541ec6b054
author Eric Fischer <enf@google.com> 1285646582 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285646582 -0700

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

Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'

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