tree f1262ea680be56c9e6afbca18ee0e2113c51cd11
parent 48571d22afffb0011c32a0fb84c14d7df49337e3
parent 142a35277b300eaea944ade0acefff15b4101302
author Baligh Uddin <baligh@google.com> 1414958041 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414958041 +0000

am 142a3527: (-s ours) am 3a4a02bc: (-s ours) am 2918d456: (-s ours) am b85a5557: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev

* commit '142a35277b300eaea944ade0acefff15b4101302':
  Import translations. DO NOT MERGE