am d1fbac1a: (-s ours) am 06d3867b: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 22:00:04 +0000 (22:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 22:00:04 +0000 (22:00 +0000)
commit5323c2d299d46a72a0bcbd3989cbc24d1c6bbc40
treec820242163241d77ef1381b204955b9d70868d68
parent54fbb3a63e7dcb2afa9480e08263d8f0e991daee
parentd1fbac1ae8782641ef78faef46f10bdb4e126b18
am d1fbac1a: (-s ours) am 06d3867b: (-s ours) Import translations. DO NOT MERGE

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