tree 1cb69d678f0bbbcd86592c68e3795644bc4fd9e9
parent 49b491bb7634284a8622e48c88571aa59ba59ac7
parent f0338376779311f2ee0c709e9735dfe5e89cde56
author Geoff Mendal <mendal@google.com> 1444048910 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444048910 +0000

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

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