tree 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d
parent 5e0def615cb6b66cfe03ec60732240b0a3636227
parent ba9f859ff76b506e1a5d8c84fad6e576b1aa09ff
author Baligh Uddin <baligh@google.com> 1442631881 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631881 +0000

am ba9f859f: (-s ours) am 008f8f0d: (-s ours) am e924107c: (-s ours) Import translations. DO NOT MERGE

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