tree 65c4fa57d7fab06389e0901b3803a56d9b50c9fd
parent 579a02f7c0440110167102f4ef051e5683ae272c
parent fda4d6710d6a97a2b517feab259c22e543cf9dee
author Baligh Uddin <baligh@google.com> 1412531999 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412531999 +0000

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

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