tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent b0e4a221c870bab59896ee8903087943beceb6f7
parent 738ad8f5b34758ee768bdc213caf4e4e994b0d06
author Baligh Uddin <baligh@google.com> 1392411009 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411009 +0000

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

* commit '738ad8f5b34758ee768bdc213caf4e4e994b0d06':
  Import translations. DO NOT MERGE