tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 1ca1e4e4d585c2aa09436ff2ec9ea07c8b3e4723
parent f0942091f21cf6db89d713ec469d8c59f135c922
author Baligh Uddin <baligh@google.com> 1392411057 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411057 +0000

am f0942091: (-s ours) am 861cdc99: (-s ours) am 8446d354: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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