tree e51e4d99329a2999501e61a3ddbce46e57a86eef
parent ed2168524b37c4124fd084b0e92f51b681773a75
parent 7a6a867f9eaacd9206ab0476f0444b417f556674
author Eric Fischer <enf@google.com> 1259722230 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259722230 -0800

am 7a6a867f: (-s ours) am c711e06c: am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair

Merge commit '7a6a867f9eaacd9206ab0476f0444b417f556674'

* commit '7a6a867f9eaacd9206ab0476f0444b417f556674':
  Import revised translations.  DO NOT MERGE