am bb611587: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 26 Jun 2014 16:49:48 +0000 (16:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jun 2014 16:49:48 +0000 (16:49 +0000)
commitcc167f03c79b126057235644d016a60de6290fd8
treec8c22b100ff97ee5406e23b498db15918c36a973
parentdc3bce93ae0b856ca4bdfdcac9fe20c89ffb8b71
parentbb6115874c6377c358019acf85d5f78a498e762b
am bb611587: (-s ours) Import translations. DO NOT MERGE

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