tree 3d1be240b3bede44f9eb560a2f9c2994da0e1a5e
parent 04e37ed86c9fc90bbf16cffd9f95d9079e7eb92d
parent edfd2a5605d126ed39df30336e3f0ffe3dd70ce0
author Eric Fischer <enf@google.com> 1285366852 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285366852 -0700

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

Merge commit 'edfd2a5605d126ed39df30336e3f0ffe3dd70ce0'

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