tree d48b2bc9fa79b7ae3acce562ffa45d8786ff5e87
parent 714dc4e6564df4fb0b2712c2609046c9d61035f3
parent ba170abed62371f26b3b1b7255ff1631d69bb964
author Baligh Uddin <baligh@google.com> 1442630486 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442630486 +0000

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

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