tree 6eeedafc6f4663960bf4024c3cb4004cd17f080e
parent 07309691c8ac9908c899eb58939823a09fe03031
parent 4f9b662905e94ee12a18d4a4703ac0e2ea63f95a
author TreeHugger Robot <treehugger-gerrit@google.com> 1496249241 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496249244 +0000

Merge changes from topic 'am-17b04ed2-88d3-4b3b-9eeb-7a7146293fc1' into ub-launcher3-master

* changes:
  Import translations. DO NOT MERGE skipped: 8b6ea60fac
  Import translations. DO NOT MERGE