tree bcf942a39972f5bab3d5fef6c824f6ee9d30ec0e
parent 1636cddbb48d0ad45028efa8756f205e78936261
parent f7203499f40af2afbcf20d5ff7555c97d86ad841
author Geoff Mendal <mendal@google.com> 1444683317 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444683317 +0000

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

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