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

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

* commit '94816967b903e82cd88d13da26a9301efbe55aa1':
  Import translations. DO NOT MERGE