tree 68dae5491d27a521ba27731b741720a9dd96c47e
parent d76ecb966dd17d4f27bff49189d63511dbd13039
parent cae13125692ed00f1a2470d46ef29856aff16ae5
author Eric Fischer <enf@google.com> 1316817882 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316817882 -0700

am cae13125: (-s ours) Import revised translations.  DO NOT MERGE

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