tree 26f71326d126dbb9d76ebe53ab898473ace2bbf6
parent 09c2b6c744e615b426315f2da3f1281f70896e15
parent 0514e0abf5727510cb51ecbeecf9c2636a1b4eb1
author Eric Fischer <enf@google.com> 1253563855 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253563855 -0700

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

Merge commit '0514e0abf5727510cb51ecbeecf9c2636a1b4eb1'

* commit '0514e0abf5727510cb51ecbeecf9c2636a1b4eb1':
  Import revised translations.  DO NOT MERGE