tree 68dae5491d27a521ba27731b741720a9dd96c47e
parent f0fa3d8bcd5dc307e7df0552e1dad0e95c8dcf59
parent 525414ba158e69797017a836a8696facc7b95b99
author Eric Fischer <enf@google.com> 1317091667 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317091667 -0700

am 525414ba: (-s ours) am 375201f4: (-s ours) Import revised translations. DO NOT MERGE

* commit '525414ba158e69797017a836a8696facc7b95b99':
  Import revised translations. DO NOT MERGE