tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 79eaeaf70bfa970789b4e81fe2e0e0384c878b59
parent ecad1b10a7bd89e7274e90fd9cc0bcfdce54e9c7
author Baligh Uddin <baligh@google.com> 1392410970 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410970 +0000

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

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