tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 738ad8f5b34758ee768bdc213caf4e4e994b0d06
parent d40b2e993f9e200081b3f9a3b06ca9dc7cccb94e
author Baligh Uddin <baligh@google.com> 1392410133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410133 +0000

am d40b2e99: (-s ours) am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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