tree ecc71e7df1aa96581fe73a4837916d43de3afe33
parent ab1d8b96f74fd0653fcbec0cd64ad7dad95d9cc5
parent df2ff4581cb3b7c736d56e72b936b9a8f10f751c
author Kenny Root <kroot@google.com> 1287190337 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287190337 -0700

am df2ff458: (-s ours) am f447a3d7: Merge "Import revised translations" into gingerbread

Merge commit 'df2ff4581cb3b7c736d56e72b936b9a8f10f751c'

* commit 'df2ff4581cb3b7c736d56e72b936b9a8f10f751c':
  Import revised translations