tree a1f6a5df8a702a6a72fb36d75e7178178848e277
parent 37c4e9bddabe1064791c75ecaed107c575d579af
parent fdec0f9205bb06274d707eea8855bdbe89333295
author Baligh Uddin <baligh@google.com> 1461082164 +0000
committer android-build-merger <android-build-merger@google.com> 1461082164 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary
am: fdec0f9  -s ours

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

Change-Id: I468e94a59b451a46384b773a18cae8d8b8aae9b4