tree 58e6fc3356095d30f2581b17897009e8c3c0d8c9
parent 382e35b883d928fd7a37220861191363a514cdd7
parent bb3a3312c982ed5cad3a4533771d74356b65f98f
author Geoff Mendal <mendal@google.com> 1436977526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436977526 +0000

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

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