tree fc667b677171193a720d937c573bb4bc62c24845
parent be37dde7872a5eeb083cfb62b010536bef65fc6c
parent 16364a0796096ffe1459963476da73a460b02c65
author Eric Fischer <enf@google.com> 1320698460 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320698460 +0000

am 08be43a6: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
  Import revised translations.  DO NOT MERGE