tree 0a58fdeab01f5b110e5212a12b25a1bc38bde348
parent 288d8570686a9f30fde0e7fae5be5f957b4c81eb
parent 75d29e40f37568e54c08497a8b72ac50c120c839
author Baligh Uddin <baligh@google.com> 1365810131 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365810131 -0700

am 75d29e40: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '75d29e40f37568e54c08497a8b72ac50c120c839':
  Import translations. DO NOT MERGE