tree a4715d80eec22ae510bf87338cc72a445c00da5d
parent 78c7429c2c272084b1753d51911c70f773d3b3e7
parent 0dc42a5d66a16589b6e8c8a57922f0134d3bcdc0
author Baligh Uddin <baligh@google.com> 1392410254 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410254 +0000

am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf

* commit '0dc42a5d66a16589b6e8c8a57922f0134d3bcdc0':
  Import translations. DO NOT MERGE