am 5323c2d2: (-s ours) am d1fbac1a: (-s ours) am 06d3867b: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 22:04:32 +0000 (22:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 22:04:32 +0000 (22:04 +0000)
commitad93ffcb74a82aea20990def7bc7859b6c78910c
treec8c22b100ff97ee5406e23b498db15918c36a973
parent21c12e8c01d9c9e8f3fefc9a7aa337d3036bac85
parent5323c2d299d46a72a0bcbd3989cbc24d1c6bbc40
am 5323c2d2: (-s ours) am d1fbac1a: (-s ours) am 06d3867b: (-s ours) Import translations. DO NOT MERGE

* commit '5323c2d299d46a72a0bcbd3989cbc24d1c6bbc40':
  Import translations. DO NOT MERGE