tree dc3f7de0be77010d335ed679d1d4fb28a9f7f745
parent 1ee93c5930ec13738215681a02078498e6fd6a7b
parent e3264d7234f0568d6619c8955f5480963a2019ff
author Eric Fischer <enf@google.com> 1255375932 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255375932 -0700

am e3264d72: (-s ours) am 312df73a: (-s ours) Merge change I122ce5c5 into eclair

Merge commit 'e3264d7234f0568d6619c8955f5480963a2019ff'

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