tree 2d388e91a1533567c67616a7eae7dbbcae486760
parent 8446d354b0b664564b9b843abc042c3a59fb7c5b
parent 835c0b74f0bb5fc7d66c561cc9f501f669b0d41a
author Baligh Uddin <baligh@google.com> 1380991024 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380991024 -0700

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

* commit '835c0b74f0bb5fc7d66c561cc9f501f669b0d41a':
  Import translations. DO NOT MERGE