am 37d28574: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 22 May 2014 03:15:56 +0000 (03:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 May 2014 03:15:56 +0000 (03:15 +0000)
commitdc3bce93ae0b856ca4bdfdcac9fe20c89ffb8b71
treec8c22b100ff97ee5406e23b498db15918c36a973
parentf04a7690b53288c98c07e0aa05214cceebea1331
parent37d285746e924723e6ec74d9e4700accc7768d0e
am 37d28574: (-s ours) Import translations. DO NOT MERGE

* commit '37d285746e924723e6ec74d9e4700accc7768d0e':
  Import translations. DO NOT MERGE