tree bffc36d92a338a9913d5818dd528bdf86b2e2773
parent 760585d09f9236b4b408174f7cc380d6437d4910
parent c2bd4bee5a5ebb450b508732af8a28a71e58765d
author Eric Fischer <enf@google.com> 1298575644 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298575644 -0800

am c2bd4bee: (-s ours) am c554fb92: Import revised translations.  DO NOT MERGE

* commit 'c2bd4bee5a5ebb450b508732af8a28a71e58765d':
  Import revised translations.  DO NOT MERGE