tree 838e272e939b46eb3bcb26a7bda2db066a92cad0
parent a8f3f067b672a8e055e76beee300cc2b1a8bea31
parent 7521c1a03e929ab7d26d4492a434a4b33bfe52c3
author Geoff Mendal <mendal@google.com> 1444048941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444048941 +0000

am 7521c1a0: (-s ours) am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE

* commit '7521c1a03e929ab7d26d4492a434a4b33bfe52c3':
  Import translations. DO NOT MERGE