tree aebc159171f8f343ebef5ea3143f56127e649a75
parent 6280893534c6eef3497e246eb5ece7f7159f6f47
parent 79d0ac937ba6d6f332e3c43fe9db43b008a04d14
author Geoff Mendal <mendal@google.com> 1444250751 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444250751 +0000

am 79d0ac93: (-s ours) Import translations. DO NOT MERGE

* commit '79d0ac937ba6d6f332e3c43fe9db43b008a04d14':
  Import translations. DO NOT MERGE