tree 42ff5543ec1bea3ab5f78b5ce8bc63e80a8aabef
parent eb7ed429f40878a64e8bf70bf74a6a28018dfadf
parent fb291f5a472c11473d936088562cd35a07c4a4b8
author Baligh Uddin <baligh@google.com> 1381204449 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381204449 -0700

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

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