tree f5c53f17365993815876c49380672490c3f578a6
parent d64131a83d486283c22d6f7c975a13a3fd0028da
parent 9870efdd359eef447709a92fef474afc04aba24a
author Baligh Uddin <baligh@google.com> 1349928047 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349928047 -0700

am 9870efdd: (-s ours) am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9870efdd359eef447709a92fef474afc04aba24a':
  Import translations. DO NOT MERGE