tree 33356e3f2507466d8343638f8a6922912a1e9a26
parent db2f1bd2ef2058eb80e05814a9500e0a5f167f8f
parent db57ef7566239bc4e42b214ac2a1a5457f9d4c22
author Eric Fischer <enf@google.com> 1319230770 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319230770 -0700

am db57ef75: (-s ours) Import revised translations.  DO NOT MERGE

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