tree aeb34e4b91acad9691f550ab1f79257c39f2c95f
parent 93da2ba340beb15cfdd19ea6a14711a6f977d999
parent b764a6003a12de9ba010a8e1a922dc95e3395d04
author Baligh Uddin <baligh@google.com> 1414961318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414961318 +0000

am b764a600: (-s ours) 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 'b764a6003a12de9ba010a8e1a922dc95e3395d04':
  Import translations. DO NOT MERGE