tree 498ad073b042ad5dea36743832e7d68fab87699c
parent 670e5ddfa639d31bfc09549626e0e91ab63a4333
parent 48eb658bd9eedf0ef0e03613a21604e238cb0360
author Eric Fischer <enf@google.com> 1299532676 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299532676 -0800

am 48eb658b: (-s ours) am c5f7f582: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '48eb658bd9eedf0ef0e03613a21604e238cb0360':
  Import revised translations.  DO NOT MERGE