tree 6fda6b275a725a6292b8c2a7b62b9a66171a0e55
parent e6e5f3607a18321f5aad1e74dee4bcbddf148d43
parent bf12cbb813488b2794e0dc23003dbfb4ad17c9cf
author android-build-team Robot <android-build-team-robot@google.com> 1525113257 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525113257 +0000

Merge changes from topic "am-d23ed9d1-698e-43d5-9428-e8e4fc599ee2" into ub-launcher3-master

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