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