am 34df5a5b: (-s ours) am a678d906: (-s ours) am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '34df5a5b36bc9848d5a098c889931879b9866cf4': Import translations. DO NOT MERGE
This commit is contained in: