tree 4bfd9469731811e4156190a6f20a417ad5b44a7c
parent 90452567f795b627f86ae46a37f9dc5e06a4997f
parent bce66392fe728780bc203657f21e65ad53c097bb
author Eric Fischer <enf@google.com> 1259717967 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259717967 -0800

am bce66392: (-s ours) am f3e11426: am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair

Merge commit 'bce66392fe728780bc203657f21e65ad53c097bb'

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