tree 5babd8338e5cd14b2492ab6013943919e004ae43
parent 889738c8f4dc075ce98ccd7b494b7de9eb3fe84c
parent 4f365804d4ad4535e2090665716621edadf82057
author Baligh Uddin <baligh@google.com> 1413732970 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413732970 +0000

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

* commit '4f365804d4ad4535e2090665716621edadf82057':
  Import translations. DO NOT MERGE