am 74a976d1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
authorBaligh Uddin <baligh@google.com>
Sat, 5 Oct 2013 16:37:03 +0000 (09:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Oct 2013 16:37:03 +0000 (09:37 -0700)
commit700c7b640f46870de33435a8af0fa76bf382bcd4
tree935c35d61dd294795fafde10067b977ad9193cf1
parent77bdf368d5a58e355dede59d9ecb36c5414f9bce
parent74a976d17222cbb2214ca2d86062d842293eb9fc
am 74a976d1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '74a976d17222cbb2214ca2d86062d842293eb9fc':
  Import translations. DO NOT MERGE