tree 6d87006194f353e4365f9c0072e3a44a734d80e1
parent 0c0e543a17eb6b09010a020656718f4e0edb46a4
parent a678d906fef4878bb1c8513d2dce49356c06934a
author Baligh Uddin <baligh@google.com> 1392410222 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410222 +0000

am a678d906: (-s ours) am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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