am 50685abb: (-s ours) am d3ad7d4d: (-s ours) am e424b26d: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Mon, 25 Aug 2014 16:53:30 +0000 (16:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Aug 2014 16:53:30 +0000 (16:53 +0000)
commitc6421773e5659ad2945edba09e67dd8fa9f03b88
tree5761d9218c5d7f96e3f33e4d9ed083e40ba778c4
parentf2b67c63ecb57179dcac8c703c68e8cf14b691e3
parent50685abb8cb91128a6eda2c2e1a063c4b48d3732
am 50685abb: (-s ours) am d3ad7d4d: (-s ours) am e424b26d: (-s ours) Import translations. DO NOT MERGE

* commit '50685abb8cb91128a6eda2c2e1a063c4b48d3732':
  Import translations. DO NOT MERGE