am a041ad47: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 15 Sep 2013 04:54:20 +0000 (21:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Sep 2013 04:54:20 +0000 (21:54 -0700)
commitd8e1221d167b2086f71b807332ea558efe83d867
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent2c25801e7e818ff949a46e54d82539bf96c8ecae
parenta041ad47c2f69d2a5439cc84b407d8aada3ed731
am a041ad47: (-s ours) Import translations. DO NOT MERGE

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