tree 0b1dc9afcf92c5aef6b2ff0f325061a946c03d75
parent 059f80e8fcb349b486e0a30cdd75a77b0df381a9
parent d4ab920dea8c20e3bc3e4b8275e5e39c4d35b44c
author Baligh Uddin <baligh@google.com> 1367710203 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367710203 -0700

am d4ab920d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9

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