am 18a5460d: (-s ours) am 4c2fddc6: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 19 Aug 2013 18:42:24 +0000 (11:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Aug 2013 18:42:24 +0000 (11:42 -0700)
commitdd1a2efe8da752beb9ec056daec947003aad2841
tree9b0a9294f51bb927444a9bd4c6b2b1a238216011
parentad7cb0e76222aea5d4f24e8743ff1fa56bf79203
parent18a5460d4c5bb75b562d886146c42f429603a7fa
am 18a5460d: (-s ours) am 4c2fddc6: (-s ours) Import translations. DO NOT MERGE

* commit '18a5460d4c5bb75b562d886146c42f429603a7fa':
  Import translations. DO NOT MERGE