tree 98418cdba5967c921c83d9ce7e2ceb1a8bf34f6b
parent b4a62ef903b15b530ded46d37bfaf8c20f90d3da
parent 028eaa34abb68b9cadf76d5284c874efb3073363
author Baligh Uddin <baligh@google.com> 1379187890 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379187890 -0700

am 73f2ced1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '73f2ced167aae278dfccddcf89b15dbb7780af88':
  Import translations. DO NOT MERGE