tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent c9fcedf28109f444b242724141f63f02e9ce788b
parent 91baff4826343738eb06229a330d269e8704cc45
author Baligh Uddin <baligh@google.com> 1410891734 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410891734 +0000

am 91baff48: (-s ours) am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

* commit '91baff4826343738eb06229a330d269e8704cc45':
  Import translations. DO NOT MERGE