tree 67bcdfbcc696bae9c39f6c72c6b6de798bc6e9dc
parent ed377249580968f76de7b1eff303cde77bfe6352
parent d6a99860f81211cb1afa4d6933d333907d6f1b79
author Geoff Mendal <mendal@google.com> 1414008370 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414008370 +0000

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

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