tree 2ab50c1e2e79713c20535ff244d5520f24a56774
parent ee3253caf8b9800a32186b78f980a9ede85dcab9
parent 3225addcb289426f54eee6dba03551b6932032c2
author Geoff Mendal <mendal@google.com> 1436978572 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436978572 +0000

am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import translations. DO NOT MERGE

* commit '3225addcb289426f54eee6dba03551b6932032c2':
  Import translations. DO NOT MERGE