am 9310aa18: am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '9310aa18865221ea8bf16345565313cc71f2d5f2':
  Import translations. DO NOT MERGE