tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 47eed63dcef5d3f60a3be617a5a4d07de139e808
parent a371f3ebabc175c47f240b9795eaf7fc2ceb926c
author Baligh Uddin <baligh@google.com> 1392411054 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411054 +0000

am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

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