tree fa5ee04086f31ebb70fbcb39558b131a799c7bce
parent 3ff9dea7537114559408a58eb1a96ad674054b54
parent 3279c8bb8069aba5cc85af32296664ffb4652830
author Geoff Mendal <mendal@google.com> 1436358866 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436358866 +0000

am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit '3279c8bb8069aba5cc85af32296664ffb4652830':
  Import translations. DO NOT MERGE