tree 7198b45cb0d713f8cd87397442fdf4d54068d3a5
parent ded38dfd28bccfee0604be5ce21f8b36ffb08368
parent 2f805f0d00b6521d6f6be25b615b3aff1b8f621d
author Geoff Mendal <mendal@google.com> 1417706145 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417706145 +0000

am 2f805f0d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit '2f805f0d00b6521d6f6be25b615b3aff1b8f621d':
  Import translations. DO NOT MERGE