tree 2c303f7886fb5c7d1e6ad45eac83da4083dfd276
parent aea765795ac48fa2497bcf6f359e380f94da5700
parent 664ecdf90b4073e24e26006f7d264f0dcfc99fad
author Bill Yi <byi@google.com> 1664303700 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664303700 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 322246e50c -s ours am: 664ecdf90b -s ours

am skip reason: subject contains skip directive

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

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