tree 2d388e91a1533567c67616a7eae7dbbcae486760
parent 861cdc99b85d0304184847493ea9be56b3449ca2
parent 98989bd7bf0116073ded47ae9ed7ea8623c5e8ed
author Baligh Uddin <baligh@google.com> 1380991194 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380991194 -0700

am 98989bd7: (-s ours) am 835c0b74: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '98989bd7bf0116073ded47ae9ed7ea8623c5e8ed':
  Import translations. DO NOT MERGE