tree d538d90d8e320da1ada87888f2d8c87f07420e06
parent a5b43767c61f1df15e80b43f2d961880647a2a97
parent 4c38d17527b8354235a852d5895e4ed229fa7e16
author Baligh Uddin <baligh@google.com> 1380170179 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380170179 -0700

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

* commit '4c38d17527b8354235a852d5895e4ed229fa7e16':
  Import translations. DO NOT MERGE