tree b7901d7108483daa28ae827539874f0e3085b8ed
parent 1de64c40429f32413be6878ec9538713bc25cf87
parent 5fb3fa01bc0fe9a72c2c307ee09f8ac95f9cae9d
author Baligh Uddin <baligh@google.com> 1380128071 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380128071 -0700

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

* commit '5fb3fa01bc0fe9a72c2c307ee09f8ac95f9cae9d':
  Import translations. DO NOT MERGE