am dccf3823: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 25 Aug 2014 16:32:47 +0000 (16:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Aug 2014 16:32:47 +0000 (16:32 +0000)
commit34ca7624b5ca10470db84cc553accd68adc9c0f5
tree6ba8baa83accc32c603cf7c83ff68c87f46d8472
parent302eaa74157841b5a9119d636f13a66e290c89ad
parentdccf38231f7c478a0a4ac84351412e7beb49b984
am dccf3823: (-s ours) Import translations. DO NOT MERGE

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