tree ce94d3a506007c42a6a9512db0fbb9368737533b
parent 3f90a2dcf62fcef1287913a85bf091accafab882
parent 1aeb7c30754efd323254519c7d8db055774fce75
author TreeHugger Robot <treehugger-gerrit@google.com> 1527819740 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1527819740 +0000

Merge changes from topic "am-1bd70ed4-061f-4a07-a290-3195cb409e98" into ub-launcher3-master

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