tree 8997f9ab6eee5181ebf4866e52605533c604030c
parent 4f439a93b806e48a5d3fec3229090707c91dd6ab
parent e3da350284412a8aa24dc4fe0133fd61f32baee5
author Geoff Mendal <mendal@google.com> 1436980409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980409 +0000

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

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