tree f6a44a57bea79b6a68f982c45b6a7f54543af20d
parent 2f3ecab0e2dc5ad47a9875582b4d01f4065791db
parent 3aadac7fba87fd2c665d16fcc20dd535f1c1dcaf
author Baligh Uddin <baligh@google.com> 1382023593 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382023593 -0700

am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '3aadac7fba87fd2c665d16fcc20dd535f1c1dcaf':
  Import translations. DO NOT MERGE