tree 7cfc9a621caf07d964a214f5240e43b6aa53a143
parent 615d1dc657a4b13c05edf6c0b6da65ae2f75523e
parent 349d14f6cc482b30eb3258f0f97e4577440e4a29
author Geoff Mendal <mendal@google.com> 1418250191 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418250191 +0000

am 349d14f6: (-s ours) am 7bcab2da: (-s ours) Import translations. DO NOT MERGE

* commit '349d14f6cc482b30eb3258f0f97e4577440e4a29':
  Import translations. DO NOT MERGE