tree 8b8c7dc1e76c54af9ad78e93ba873068df73ec2b
parent f89882e431314ac3fa3b1f786c8c394631faec25
parent eb140c18d92779ebfe909d3e331707697afb91f8
author Baligh Uddin <baligh@google.com> 1412023525 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023525 +0000

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

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