am 06d3867b: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 21:55:42 +0000 (21:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 21:55:42 +0000 (21:55 +0000)
commitd1fbac1ae8782641ef78faef46f10bdb4e126b18
tree7c06459298f663be0daccd25a88f7532dfd49761
parente8137079c27a1a7caccdd61cd486211996a3f783
parent06d3867b1d96c3ad73d677e7c04a8d94b9f93c8b
am 06d3867b: (-s ours) Import translations. DO NOT MERGE

* commit '06d3867b1d96c3ad73d677e7c04a8d94b9f93c8b':
  Import translations. DO NOT MERGE