tree 6d6df0f17697f8a3da27baf6a8cadd0631b462c5
parent f22d43fd67dbc39f26e6b38cc630d93cbe8d378d
parent 5053abb0eb1cadc0dd13f135f6129b22c74207ca
author Geoff Mendal <mendal@google.com> 1436364584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436364584 +0000

am 5053abb0: (-s ours) Import translations. DO NOT MERGE

* commit '5053abb0eb1cadc0dd13f135f6129b22c74207ca':
  Import translations. DO NOT MERGE