tree 128bb85a92cc0c7840346847b9ac0abfb45d7973
parent 018a7ff52ce7c77d1e2a894024ed36b4da9f2ad7
parent f0f0326e3fd95d58c7ad9012ac530b944cd8056f
author Baligh Uddin <baligh@google.com> 1392411651 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411651 +0000

am f0f0326e: (-s ours) am bf78f00a: (-s ours) am aa61fd71: (-s ours) am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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