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

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

* commit 'dde4f6841df417d0f584e773c5662aee4bf6fb68':
  Import translations. DO NOT MERGE