tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 5d20cab90d526796d8b2ee4a1e0949ce703ae891
parent 7e0c421585928f7de9336f6af45000b2e3ca9ddc
author Baligh Uddin <baligh@google.com> 1392411665 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411665 +0000

am 7e0c4215: (-s ours) am bb69c0d8: (-s ours) am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE

* commit '7e0c421585928f7de9336f6af45000b2e3ca9ddc':
  Import translations. DO NOT MERGE