tree d62b78cd7493659e0118f436eb7326d3cf86a38e
parent fce5cefa29ee61343d5d626714afabe9408e9c60
parent daf0cbb2fd0782f9f45923bdb889325c3ea8b130
author Geoff Mendal <mendal@google.com> 1436980647 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980647 +0000

am daf0cbb2: (-s ours) am 432f67c4: (-s ours) am d28d46e3: (-s ours) am 22c0a189: (-s ours) Import translations. DO NOT MERGE

* commit 'daf0cbb2fd0782f9f45923bdb889325c3ea8b130':
  Import translations. DO NOT MERGE