tree d947b8de953533787eaeb35398cebb5a3631b62e
parent 1e20f3bd7655cb2f8ef178dff9ed58bff081c14a
parent 5b72a5b940011a009728978545099edce733c0ca
author Eric Fischer <enf@google.com> 1257553661 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257553661 -0800

am 5b72a5b9: (-s ours) am 5a655607: Import revised translations.  DO NOT MERGE

Merge commit '5b72a5b940011a009728978545099edce733c0ca'

* commit '5b72a5b940011a009728978545099edce733c0ca':
  Import revised translations.  DO NOT MERGE