tree e7ae075143d92bf5d5d5ec890994bff9f55da048
parent 6ed14dde57773ddb8c8ed322b5f67b442e0971a0
parent 63f541d52c7e5abc6a076213f62e806480f2026b
author Eric Fischer <enf@google.com> 1327694618 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327694618 -0800

am 63f541d5: Import translations. DO NOT MERGE

* commit '63f541d52c7e5abc6a076213f62e806480f2026b':
  Import translations. DO NOT MERGE