tree d6c1a51de06e07288193a9b60f44aeefef7f4d7f
parent 131b4892681be6004ad60925e40b66eafb4c65df
parent 21b663ca67db1162eef41eec881fecba9d3deb63
author Baligh Uddin <baligh@google.com> 1443204480 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443204480 +0000

am 21b663ca: (-s ours) am 897eeeb7: (-s ours) am 3082585c: (-s ours) Import translations. DO NOT MERGE

* commit '21b663ca67db1162eef41eec881fecba9d3deb63':
  Import translations. DO NOT MERGE