tree 152f5735380438c6e46703b6fa33c400785c97fc
parent ab6318445380176b3a262281d98af22985e18500
parent 36c123ec6b74be058702a37e8a01702b505da5c1
author Baligh Uddin <baligh@google.com> 1392981300 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392981300 -0800

am 36c123ec: (-s ours) am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE

* commit '36c123ec6b74be058702a37e8a01702b505da5c1':
  Import translations. DO NOT MERGE