tree d62b78cd7493659e0118f436eb7326d3cf86a38e
parent 6e1f6822c7b4c5b3f339e5981b3f8a96b6661a83
parent 432f67c4a0f77880f6def1150ea803b54367a175
author Geoff Mendal <mendal@google.com> 1436980140 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980140 +0000

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

* commit '432f67c4a0f77880f6def1150ea803b54367a175':
  Import translations. DO NOT MERGE