tree 68dae5491d27a521ba27731b741720a9dd96c47e
parent 8dcad527e885b0b3d05ad31a0c3905a826974812
parent 4c813fa46522426ed6e66390f539254aee331205
author Eric Fischer <enf@google.com> 1317176397 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317176397 -0700

am 4c813fa4: (-s ours) am 5ccc9479: (-s ours) Import revised translations.  DO NOT MERGE

* commit '4c813fa46522426ed6e66390f539254aee331205':
  Import revised translations.  DO NOT MERGE