am e4dc524e: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 1 Oct 2013 04:48:06 +0000 (21:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Oct 2013 04:48:06 +0000 (21:48 -0700)
commit3da88ae626f185b66b636ac225f091055d1aeb22
tree84b01408d1af8384096f63630a18a911271511fa
parent3d1eb366ef744a8790d89535a585bb50bcc7c113
parente4dc524e195b2dd8d86dd80504500f8f5bb11d92
am e4dc524e: (-s ours) Import translations. DO NOT MERGE

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