tree 128bb85a92cc0c7840346847b9ac0abfb45d7973
parent a42136166b61091f8d5b9b2a32f84b71d35af8cb
parent bf78f00a78317c7d7684daf4d09c7f51a397fbcf
author Baligh Uddin <baligh@google.com> 1392411175 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411175 +0000

am bf78f00a: (-s ours) am aa61fd71: (-s ours) am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit 'bf78f00a78317c7d7684daf4d09c7f51a397fbcf':
  Import translations. DO NOT MERGE