tree 1c9cb2ec3d045c8cc468ed837d84b8e46e661e08
parent f4df0f573747471f692baa6da4f57e891d1bcd6a
parent c9aae202c9c1159ff84f3d6eacbfbe0ca4cb40ad
author Bill Yi <byi@google.com> 1628389132 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628389132 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07d017a5a0 -s ours am: c9aae202c9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I173edb51758508c0d4207924efb8f9b1f8943f03