tree 7bc3237c884c762eb5e39ce582fcac31a49c8100
parent 8787f69682685237155a8076cfed51a3b25f30f9
parent acbbd5024f1f1c69097f9646ef1f982bf980d86f
author Bill Yi <byi@google.com> 1629248890 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629248890 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours am: e0b69a2ae5 -s ours am: 008f2fea1e -s ours am: acbbd5024f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I778f07efb00f1ff830ba25693eaba7918806fa84