tree 83545401d081e3b5ff16de3cdda9e853b0007f3c
parent 923c633ccfda45312fec5a3484b6cc1308cc71ab
parent 05cb82caeed3d1b710c74cbba5ac97ee61c1d8ae
author Baligh Uddin <baligh@google.com> 1371072610 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371072610 -0700

am 05cb82ca: (-s ours) am 96acc0e5: Import translations. DO NOT MERGE

* commit '05cb82caeed3d1b710c74cbba5ac97ee61c1d8ae':
  Import translations. DO NOT MERGE