tree 6f347a87730650cbe57ffdab3dd7c7c74125905c
parent 91bd43c3de3d9a8a51a6334f7bd6a58ba03650dd
parent 3186c3723e143be8c0ab9389118f695ea7c183b4
author Baligh Uddin <baligh@google.com> 1409608336 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409608336 +0000

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

* commit '3186c3723e143be8c0ab9389118f695ea7c183b4':
  Import translations. DO NOT MERGE