tree 0b1dc9afcf92c5aef6b2ff0f325061a946c03d75
parent d4271056074a7d2337359f1db3f0c4b8ef671074
parent 8f54b765cb65e8e8596375c24189aa8741f0a3e5
author Baligh Uddin <baligh@google.com> 1367710398 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367710398 -0700

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

* commit '8f54b765cb65e8e8596375c24189aa8741f0a3e5':
  Import translations. DO NOT MERGE