am d5c43876: (-s ours) am 1a0e1c0e: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 29 Oct 2013 03:55:13 +0000 (20:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Oct 2013 03:55:13 +0000 (20:55 -0700)
commit97202826ab4d3ccd925212a5e093211fc46e0cf9
tree8acc285e3c0688b50840bb525668609eb7ff4cf7
parentba6071ed0b7e674986887c6753ee5efbf7b5b25d
parentd5c438761040510845e67979079f37da0737966f
am d5c43876: (-s ours) am 1a0e1c0e: (-s ours) Import translations. DO NOT MERGE

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