tree b514657debba0a89df55775c634d295891357284
parent 73ef12ebf6f2ba056ef7d7453c2763aa5ebdf732
parent 34c4418964deaa59df99b3098fcee0e481b8537f
author Bill Yi <byi@google.com> 1630271367 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630271367 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3eac3bdadf -s ours am: 6e4055c5f8 -s ours am: df8a84e703 -s ours am: 34c4418964 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15688215

Change-Id: I231de93b1b8063690f06ff0a95c3c5453c0be6e8