tree f2d418019b6578c15c214e6a0cf3b7dd6c78a542
parent 8bc1a13e1bcd603af0ef1860b14fff0bcecb5172
parent 521c59a88201b0c74991d4928f19ece4d33e53c1
author Geoff Mendal <mendal@google.com> 1444250431 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444250431 +0000

am 521c59a8: (-s ours) Import translations. DO NOT MERGE

* commit '521c59a88201b0c74991d4928f19ece4d33e53c1':
  Import translations. DO NOT MERGE