tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent edb69ed9fc72138471df6f6d787ed25fa41c45b3
parent ef69114ffb59392c7f2f7872e1c27d2a43f35c21
author Baligh Uddin <baligh@google.com> 1392411519 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411519 +0000

am ef69114f: (-s ours) am 738ad8f5: (-s ours) am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

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