tree 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89
parent a993c59d09add350ce44752c0541783b19858d4c
parent a70760aa73899e532642faf1d603205e1a079660
author Baligh Uddin <baligh@google.com> 1411322507 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411322507 +0000

am a70760aa: (-s ours) am 1c820785: (-s ours) Import translations. DO NOT MERGE

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