tree b75274db904dfd346fab21ffe08aa85f65737172
parent d177e48816d0853031a4891baf4b4922c2af3ab7
parent 2731e07d2fb8d2b0e7a33cb84e97374a38bd094f
author Baligh Uddin <baligh@google.com> 1414957921 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414957921 +0000

am 2731e07d: (-s ours) am 3e7df197: (-s ours) am 5b137b4d: (-s ours) am e04df83d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev

* commit '2731e07d2fb8d2b0e7a33cb84e97374a38bd094f':
  Import translations. DO NOT MERGE