tree 210189ffcc165ad72a40bb7a20a2326f13e863c8
parent 3782fe0a88f8ba98a8c7b6c2ce6cbb4204325033
parent 7e420ae0d6432a5236d10c018b4f42ab34441085
author Geoff Mendal <mendal@google.com> 1436382406 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436382406 +0000

am 7e420ae0: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-launcher3-burnaby

* commit '7e420ae0d6432a5236d10c018b4f42ab34441085':
  Import translations. DO NOT MERGE