tree 4e032d673f46bbc757b8711ebe5ab7814d688afd
parent dbdc82c20de0fe3a28f487c223062d431620be11
parent 6ba0977dcebb38910bd5afdd9259e1e3e3edd524
author Geoff Mendal <mendal@google.com> 1414010896 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414010896 +0000

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

* commit '6ba0977dcebb38910bd5afdd9259e1e3e3edd524':
  Import translations. DO NOT MERGE