tree 5f766cd270ea2726e4a1ae36df6fec433fcc7116
parent 81d39be55a808acd30bea4c7297ee48d24e80b96
parent fee3f152f8a88fd9cf5cd6eea11cd7a8161ba54e
author Baligh Uddin <baligh@google.com> 1414956795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414956795 +0000

am fee3f152: (-s ours) am 094fb74a: (-s ours) am 185eb1ee: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev

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