tree 625b3f45e8a95acd8747e79877ee5adc3f302118
parent 15c402e53d566beed926d66beeff5eb355cbd5b7
parent 74549ba9c3f4c743dabee9a1c8b233007bf96374
author Bill Yi <byi@google.com> 1688841053 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1688841053 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74549ba9c3 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23979196

Change-Id: Ib9ebfbbc0ef5e77b0744aa879f8e16e5869b6560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>