tree 18047c91f93fd9fadf91859f001014820a123c38
parent 369d80c50e5dfbd405a0c41348f151dbb4686d05
parent 2598d3ce5b7571e3e781a77da7bee8f7f224f294
author Geoff Mendal <mendal@google.com> 1436186196 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436186196 +0000

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

* commit '2598d3ce5b7571e3e781a77da7bee8f7f224f294':
  Import translations. DO NOT MERGE