tree 4badc2a6c4430a38a177eb91c5d05fff327d24d7
parent 236da40d4509802d9017de3cca4b176a4b84eb4a
parent b34c04df74ee7d6c76ddc134a1560a030b4dc0b7
author Eric Fischer <enf@google.com> 1319238356 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319238356 -0700

am b34c04df: (-s ours) am 4c165fe6: (-s ours) Import revised translations.  DO NOT MERGE

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