tree fbb275f0fe01e5ab5f39bf9b826b9652e345f4f5
parent 34971369a659c1b348f73b16216892e9e99e2e6e
parent 1cb0b3fb2a48bf1b5daf63f312989a133fb4b8ef
author Geoff Mendal <mendal@google.com> 1436980341 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980341 +0000

am 1cb0b3fb: (-s ours) am 9f448819: (-s ours) am 86b877df: (-s ours) am cf2b3aea: (-s ours) Import translations. DO NOT MERGE

* commit '1cb0b3fb2a48bf1b5daf63f312989a133fb4b8ef':
  Import translations. DO NOT MERGE