am a0daefb0: (-s ours) am 34f6f70e: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 6 Nov 2013 05:02:58 +0000 (21:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Nov 2013 05:02:58 +0000 (21:02 -0800)
commit4ff1765c9660b2e1288560e94b7a208170bdd810
tree8acc285e3c0688b50840bb525668609eb7ff4cf7
parent97202826ab4d3ccd925212a5e093211fc46e0cf9
parenta0daefb0032289905ab369b98a886dc322346e9c
am a0daefb0: (-s ours) am 34f6f70e: (-s ours) Import translations. DO NOT MERGE

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