tree 1b3f6dbdedfed838dfc65aec0844f4f88bfd2d0c
parent 0feaa2f95ecbdc015a82ceb1122dc9ff64187e02
parent fe29877b7b41953148907dbe98036a7064f7b0b5
author Geoff Mendal <mendal@google.com> 1433359415 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433359415 +0000

am fe29877b: (-s ours) am 899bd8c6: (-s ours) am f42d5ee4: (-s ours) Import translations. DO NOT MERGE

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