am cc167f03: (-s ours) am bb611587: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 26 Jun 2014 16:54:05 +0000 (16:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jun 2014 16:54:05 +0000 (16:54 +0000)
commitc1ab45d41494b97b87411cb9a076ff0988bfcac9
tree477a9455b857b3578af8ec0bb2a31c746e4fed34
parent40d7ef3fd4d8cc17a5441a2904be4e84622de265
parentcc167f03c79b126057235644d016a60de6290fd8
am cc167f03: (-s ours) am bb611587: (-s ours) Import translations. DO NOT MERGE

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