tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 98e5bd3c3f94a159e8c5da8eb5b3bd086f6c4d8d
parent 542cf02d69be16ac39c5839f81cec43cda2802d4
author Baligh Uddin <baligh@google.com> 1392411083 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411083 +0000

am 542cf02d: (-s ours) am 93e416b2: (-s ours) am fb291f5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '542cf02d69be16ac39c5839f81cec43cda2802d4':
  Import translations. DO NOT MERGE