tree 6a34028e09b9b2af7a10fae30ff3fba13914eb86
parent 8747552cdb2d975892182f5437445ba5f8df50c4
parent f4f5c5878cc5d7f4b0613056e9720121bb58c846
author Geoff Mendal <mendal@google.com> 1436980638 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980638 +0000

am f4f5c587: (-s ours) am dfbe645b: (-s ours) am e8fe2950: (-s ours) am 944ee8a7: (-s ours) am f5766c04: (-s ours) Import translations. DO NOT MERGE

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