tree e3649ccdc435789055b059c812073aaf97cc09e7
parent e39171f09fbf090ae85081106880377265a8fe1f
parent 40a558cf68a68121364316c92b8f862efa79b891
author Eric Fischer <enf@google.com> 1337006948 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337006948 -0700

am 40a558cf: (-s ours) Import translations. DO NOT MERGE

* commit '40a558cf68a68121364316c92b8f862efa79b891':
  Import translations. DO NOT MERGE