tree dc2570f52f48aa2260d00671a73aea0899dbe26a
parent fb3ce46dfc6a2eff516dadb2cb6b4f3c705831b4
parent ce3ab3aa14af03cedf6f29c5d894337afcc7613f
author TreeHugger Robot <treehugger-gerrit@google.com> 1524283596 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1524283596 +0000

Merge changes from topic "am-3df8ff9b-c4af-41c1-85f8-6d2ce4299eac" into ub-launcher3-master

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: dcbd321095
  Import translations. DO NOT MERGE