tree 10d34031da2fd2629856b822dac2ea6c564f163f
parent 00b8a2bcdfc8054df5f029f421ac485163c67e1f
parent f32cd5fbbb7b7ec1753606669c8936fd956df494
author Geoff Mendal <mendal@google.com> 1421858004 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421858004 +0000

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

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