tree 19ab8bca32a31b13d1cd672de84982b6d85cb8d4
parent d9d94b7d706cbb03b44b1cf72e8441ebea890f04
parent 382e35b883d928fd7a37220861191363a514cdd7
author Geoff Mendal <mendal@google.com> 1436800192 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436800192 +0000

am 382e35b8: (-s ours) Import translations. DO NOT MERGE

* commit '382e35b883d928fd7a37220861191363a514cdd7':
  Import translations. DO NOT MERGE