am 33f5d575: (-s ours) am fd74e7a7: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 7 Jul 2014 17:41:23 +0000 (17:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 17:41:23 +0000 (17:41 +0000)
commit35d87b227c051bfdaa61b646de37cafd9cfee2c0
tree78b845bf79a7ca75a051966cc0b8e012427fdc6a
parentbb88e213b7056962df79f34079a51ec875191242
parent33f5d5750b50208fddb86cc7d96616ca7978fd5d
am 33f5d575: (-s ours) am fd74e7a7: (-s ours) Import translations. DO NOT MERGE

* commit '33f5d5750b50208fddb86cc7d96616ca7978fd5d':
  Import translations. DO NOT MERGE