am dc3bce93: (-s ours) am 37d28574: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 22 May 2014 03:28:52 +0000 (03:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 May 2014 03:28:52 +0000 (03:28 +0000)
commit3861ca035ddf11ae56efe57db458922a6d064305
treef0b98cfd058368b01c95aab839c12cab377aba8f
parent090eee72b07385f017bb12b4f8e965e536d30995
parentdc3bce93ae0b856ca4bdfdcac9fe20c89ffb8b71
am dc3bce93: (-s ours) am 37d28574: (-s ours) Import translations. DO NOT MERGE

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