tree bac15d7cb97ed387a7e67983830b2739fcbbd2e1
parent 404258786576cc1cee1496142f69ff382d67b87a
parent 576359ce60d2e0ef8205737570c647c29e3fe922
author Eric Fischer <enf@google.com> 1321938473 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938473 -0800

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

* commit '576359ce60d2e0ef8205737570c647c29e3fe922':
  Import revised translations. DO NOT MERGE