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

am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '4082c8c7d7a881341fed5e21ee9f22efe1f8b132':
  Import translations. DO NOT MERGE