tree 894a23f9818ef3e77b821fe76d4963ab092d31e8
parent 506f8ab83c78bf92f7e58f2d14d42281f2f410f3
parent 58039d634cb36da561501ccfafc266e1d83d0b4f
author Eric Fischer <enf@google.com> 1335377519 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335377519 -0700

am 58039d63: (-s ours) Import translations. DO NOT MERGE

* commit '58039d634cb36da561501ccfafc266e1d83d0b4f':
  Import translations. DO NOT MERGE