tree 359528e8d8c2f858cb7f1c863aaeb52a778de63c
parent 16ecb9979771bf5040d5674e9bc52d746e6a2a53
parent 8db28246dd7d98dbee43ae6697364c6a1f06f0ea
author Eric Fischer <enf@google.com> 1297191211 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297191211 -0800

am 8db28246: (-s ours) am 8855adab: Import revised translations.  DO NOT MERGE

* commit '8db28246dd7d98dbee43ae6697364c6a1f06f0ea':
  Import revised translations.  DO NOT MERGE