am 1ae72b1b: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 26 Aug 2013 22:00:43 +0000 (15:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Aug 2013 22:00:43 +0000 (15:00 -0700)
commit204e1dfabd35001917aa1d8761690cee15744297
tree74dda531904e1af91062261d83d71cf659b402df
parent4954e29fbce2582f23df8c0aad4bb5463ee7e602
parent1ae72b1b852ba7d08b03afb465c7f9d45d1b250b
am 1ae72b1b: (-s ours) Import translations. DO NOT MERGE

* commit '1ae72b1b852ba7d08b03afb465c7f9d45d1b250b':
  Import translations. DO NOT MERGE