tree ed81fe1a745f68a1cac38639313570bf3ed8c962
parent 179594bb471d401fca5fdf372617ca9bbcf97252
parent 024fb4d4b803c35b3aad784f6a2d877a7118c3b2
author Geoff Mendal <mendal@google.com> 1441640560 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441640560 +0000

am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE

* commit '024fb4d4b803c35b3aad784f6a2d877a7118c3b2':
  Import translations. DO NOT MERGE