tree 75be3c10f95d7f94eb6a638098b6947a17dc0ed4
parent 7809dc132d23b16280b1ef9935443143e6c5db47
parent 6bde0a59ed14e662031e943ab7f7b644b6aef60f
author Eric Fischer <enf@google.com> 1255479489 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255479489 -0700

am 6bde0a59: (-s ours) am 16d76289: Import revised translations.  DO NOT MERGE

Merge commit '6bde0a59ed14e662031e943ab7f7b644b6aef60f'

* commit '6bde0a59ed14e662031e943ab7f7b644b6aef60f':
  Import revised translations.  DO NOT MERGE