am bdba041e: (-s ours) am 58a8f205: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:30:20 +0000 (02:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:30:20 +0000 (02:30 +0000)
commit45d54edd33098c4dd77bc6e3e4e078de954351e4
treef06f84b6a0cc3a8885681293d97e184e17bf0fe3
parentc35cce86a2bea8137d5f77c50f4e8b9373f027c0
parentbdba041eb86f06dbf8a2832d342bfdfdeb4b39cf
am bdba041e: (-s ours) am 58a8f205: (-s ours) Import translations. DO NOT MERGE

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