tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 33a5fd70c665189915cb87d9e45c922c7303ab97
parent a5b43767c61f1df15e80b43f2d961880647a2a97
author Baligh Uddin <baligh@google.com> 1392410107 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410107 +0000

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

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