tree 6e1e6e92abc4baf27244769eacc7efed1d93709f
parent e8f9411cecb1bf234cf50bb7965c22d6c2a5b8bf
parent 0e3a048700d24ad600b8304f5e82605f1a1dce48
author Geoff Mendal <mendal@google.com> 1416864067 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416864067 +0000

am 0e3a0487: (-s ours) Import translations. DO NOT MERGE

* commit '0e3a048700d24ad600b8304f5e82605f1a1dce48':
  Import translations. DO NOT MERGE