am 4c2fddc6: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 19 Aug 2013 18:39:52 +0000 (11:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Aug 2013 18:39:52 +0000 (11:39 -0700)
commit18a5460d4c5bb75b562d886146c42f429603a7fa
tree7ec9bafab371f904e473327cbcec01bf137ee7e9
parentfece79d81ad50ddb5be4e0172d87d1438caa9e8e
parent4c2fddc6281587d86f29d634089e76ca4df796a2
am 4c2fddc6: (-s ours) Import translations. DO NOT MERGE

* commit '4c2fddc6281587d86f29d634089e76ca4df796a2':
  Import translations. DO NOT MERGE