tree 6a34028e09b9b2af7a10fae30ff3fba13914eb86
parent 717e03bd0650331cb6fc4adf763dde0581a51ad4
parent f5766c04c3c23711f7cbfaebf75d210924013b97
author Geoff Mendal <mendal@google.com> 1436977521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436977521 +0000

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

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