tree e471de8480341446ce057c9fe11ce978917e5fae
parent 85781e88469c2b65d205ec4265f1991ac86ded5b
parent 198235a94fb0c435e75d201daeea9b9173ad5508
author Baligh Uddin <baligh@google.com> 1382758811 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382758811 -0700

am 198235a9: (-s ours) am c9dea6d6: (-s ours) Import translations. DO NOT MERGE

* commit '198235a94fb0c435e75d201daeea9b9173ad5508':
  Import translations. DO NOT MERGE