tree d1960db3e5a6ef989e3364489f1a56110c79de98
parent 66bc7e1b2de3e0356c618a916257c59afb10c994
parent 312df73a1fb84a221a1d1e7fe675f93dbd5230ba
author Eric Fischer <enf@google.com> 1254941205 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254941205 -0700

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

Merge commit '312df73a1fb84a221a1d1e7fe675f93dbd5230ba' into eclair-mr2

* commit '312df73a1fb84a221a1d1e7fe675f93dbd5230ba':
  Import revised translations.   DO NOT MERGE