tree c560330f63f0d44302791c6c42268f18c5732def
parent f3154ed9194dd5cabc90e71c83471fe5a43bb78c
parent 281907b54fb3ef5203837f1daedf359632dc32c7
author Geoff Mendal <mendal@google.com> 1439816889 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439816889 +0000

am 281907b5: (-s ours) am 3447541c: (-s ours) Import translations. DO NOT MERGE

* commit '281907b54fb3ef5203837f1daedf359632dc32c7':
  Import translations. DO NOT MERGE