tree 65c4fa57d7fab06389e0901b3803a56d9b50c9fd
parent 4a2ad854ed26bba1c5beb4d849e1db07fe6aedf1
parent 20347611513c1b3e5a129797f32c091d1a0e91ce
author Baligh Uddin <baligh@google.com> 1412532561 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532561 +0000

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

* commit '20347611513c1b3e5a129797f32c091d1a0e91ce':
  Import translations. DO NOT MERGE