tree d480a9df18213d791f716ded764bcd22e74dbd2d
parent ab3f2492401aa63d73fbf4de9068ee2281f2d98f
parent 66bc258aa210878ccf21a9692fb4fbeedb300d3f
author Baligh Uddin <baligh@google.com> 1398219862 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398219862 +0000

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

* commit '66bc258aa210878ccf21a9692fb4fbeedb300d3f':
  Import translations. DO NOT MERGE