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

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

* commit '579a02f7c0440110167102f4ef051e5683ae272c':
  Import translations. DO NOT MERGE