am 34ca7624: (-s ours) am dccf3823: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 25 Aug 2014 16:45:16 +0000 (16:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Aug 2014 16:45:16 +0000 (16:45 +0000)
commit890dd81d61ea792dacd3ce5e37535b838513e52b
tree6ba8baa83accc32c603cf7c83ff68c87f46d8472
parentc502ca7dc8f36d4c41e1c3b3b1a8a60408fac08c
parent34ca7624b5ca10470db84cc553accd68adc9c0f5
am 34ca7624: (-s ours) am dccf3823: (-s ours) Import translations. DO NOT MERGE

* commit '34ca7624b5ca10470db84cc553accd68adc9c0f5':
  Import translations. DO NOT MERGE