tree c2854f9c72d274b559da4fa7dc09d7d534b3c17b
parent 191db274eefd726da7c7bbe96ba86b92b6a6a4e1
parent 44784b98fe3cb79bee1f8cef06ba3b3b8d7d5836
author Geoff Mendal <mendal@google.com> 1423783363 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423783363 +0000

am 44784b98: (-s ours) Import translations. DO NOT MERGE

* commit '44784b98fe3cb79bee1f8cef06ba3b3b8d7d5836':
  Import translations. DO NOT MERGE