tree c85f1328369e8a177f249020b4ae4ec5887ab1c6
parent a8a889b77f63805d3b5da69a0d4087c913e6d8ce
parent c9ee63bf16232a5eb8b0d73ce3ac3e6d49252113
author android-build-team Robot <android-build-team-robot@google.com> 1525801137 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525801137 +0000

Merge changes from topic "am-7c959190-3b54-4523-8358-e7e50b55e14c" into ub-launcher3-master

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