tree c60c7c773df3a9e5752a0a17825571da34a3cb9d
parent 11b848bb4a497f89a5bb21ecb2f2f0dc86e5d703
parent 28791f9dd09fc86e72f086856fa64f08b83b59a5
author Geoff Mendal <mendal@google.com> 1431597634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431597634 +0000

am 28791f9d: (-s ours) Import translations. DO NOT MERGE

* commit '28791f9dd09fc86e72f086856fa64f08b83b59a5':
  Import translations. DO NOT MERGE