tree d6750bf3bcda24f384f6fdbaab0f5fd9a870d4fe
parent b72aa65b726f6d32e487de179c3dfa1ff43eab7d
parent d28d000684290009b3b615a6ac7fd9a858744fa0
author Geoff Mendal <mendal@google.com> 1436977523 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436977523 +0000

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

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