tree 52e6206a4bfaaae3017a871aecc0bde01e34a1e5
parent 841b4c3f11cd8578c5d87699afdcc3952964b06b
parent d342d19e2cdbb0cd5c583af547021d449740af38
author Baligh Uddin <baligh@google.com> 1381033260 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381033260 -0700

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

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