tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 96522598e26892ce391637ae000b2c465ea3d201
parent 7bfcb956ced721c611b8a441fedf3026b9366481
author Baligh Uddin <baligh@google.com> 1392411495 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411495 +0000

am 7bfcb956: (-s ours) am ecad1b10: (-s ours) am a5b43767: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '7bfcb956ced721c611b8a441fedf3026b9366481':
  Import translations. DO NOT MERGE