tree fd85338e2745fcf3ffe05f812bf1bf42ee9378cc
parent e906071d72c98a0e3529f98f892397c5122ce200
parent c5b966052888e57cc637aa49a07655cb90f506c5
author Baligh Uddin <baligh@google.com> 1405621115 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405621115 +0000

am c5b96605: (-s ours) am 94816967: (-s ours) Import translations. DO NOT MERGE

* commit 'c5b966052888e57cc637aa49a07655cb90f506c5':
  Import translations. DO NOT MERGE