tree 95f35e36562f610b42f749778a97ed4700b137f2
parent 8e7448528643e6d195987a34a80d60d75d915148
parent 184cf9e135d8232188dcdfe6fe0ada9fe027a73d
author Eric Fischer <enf@google.com> 1258164369 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258164369 -0800

am 184cf9e1: (-s ours) am b5a84041: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '184cf9e135d8232188dcdfe6fe0ada9fe027a73d'

* commit '184cf9e135d8232188dcdfe6fe0ada9fe027a73d':
  Import revised translations.  DO NOT MERGE