tree 5c6d4ae25623160f490ab6ac9448bdec43825525
parent c3307615299fc763138106260ad5599a0ab4e6ce
parent 46170fd3d7f2e5d6e47a1b6eb83a0b7c97eae510
author Eric Fischer <enf@google.com> 1318963252 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963252 -0700

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

* commit '46170fd3d7f2e5d6e47a1b6eb83a0b7c97eae510':
  Import revised translations.  DO NOT MERGE