tree e290e3c21294bea144798ee02f15eca74cf30f53
parent b1cdfe80d93363e5719d71d719657b69eadbd984
parent f2509bea90836a50ccc121cb38120fdcce20b383
author Eric Fischer <enf@google.com> 1281033849 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281033849 -0700

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

Merge commit 'f2509bea90836a50ccc121cb38120fdcce20b383'

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