tree 27e47a9de5119e7bc17dc433073245c57cef14ed
parent 5f74f11cc18fd75004fb39e9e0b942b222811c53
parent 23fa01bbdae5a89e6d77b604598313c6b150f36a
author Eric Fischer <enf@google.com> 1337970913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337970913 -0700

am 23fa01bb: Import translations. DO NOT MERGE

* commit '23fa01bbdae5a89e6d77b604598313c6b150f36a':
  Import translations. DO NOT MERGE