tree 5a4e6973800d854405794ca82808868564411939
parent b7065916e20123dd75fad7e90b47f7d836d44dae
parent 458bfeea12d68ad8b2723d74fc8fea799c1e4e1b
author Baligh Uddin <baligh@google.com> 1367873853 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367873853 -0700

am 458bfeea: (-s ours) am a8478986: (-s ours) am b55b15c3: Import translations. DO NOT MERGE

* commit '458bfeea12d68ad8b2723d74fc8fea799c1e4e1b':
  Import translations. DO NOT MERGE