tree 2b2a04b246c0a15e3b115ffc6526b4f42ab35153
parent 5cc245d391305fb3c84ef3c0242ea7d2d174c8bb
parent 3231367ce406ecba1e6add431da0804fd3fd21d5
author Baligh Uddin <baligh@google.com> 1443326970 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443326970 +0000

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

* commit '3231367ce406ecba1e6add431da0804fd3fd21d5':
  Import translations. DO NOT MERGE