tree cd71883ededb24abdd594c1ba2062c06cae2208f
parent 342f38f9a95e26b20ebaaac6402409beb9ba96f8
parent b8c7c66de23b9b20f3992722bb5e346d8e12dd0e
author Eric Fischer <enf@google.com> 1301433591 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301433591 -0700

am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

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