tree 0f550deef429add26bf3259e5fae393cdb6e3048
parent 870ba70288fe4a5a7f9e23631faa7379573ae506
parent dbad1a72565779472fb88d7dec994dcf0629414e
author Geoff Mendal <mendal@google.com> 1444829154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444829154 +0000

am dbad1a72: (-s ours) am 341e4d23: (-s ours) Import translations. DO NOT MERGE

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