tree e0178d987128140780d2bc0c4e5a9f421fca2d46
parent b0b55895dd33889ebe3e1117078e4a2e493b2812
parent dc0b294b6025d00df52f4869df0f4d6e982567c7
author Eric Fischer <enf@google.com> 1301443156 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301443156 -0700

am dc0b294b: (-s ours) am 62b1401e: am 85683ad9: (-s ours) Import revised translations.  DO NOT MERGE

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