am 6006439c: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 21:57:14 +0000 (21:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 21:57:14 +0000 (21:57 +0000)
commit6de8911d35a912f3f51900a59cf796da925f2609
treec8c22b100ff97ee5406e23b498db15918c36a973
parentcc167f03c79b126057235644d016a60de6290fd8
parent6006439c15528bd8f5a85b20f470037b48a76e59
am 6006439c: (-s ours) Import translations. DO NOT MERGE

* commit '6006439c15528bd8f5a85b20f470037b48a76e59':
  Import translations. DO NOT MERGE