tree 2cfcc7682e8ead397f2668c47cf27bcb081bebf0
parent b14caa52cc63db24aa38d6f72baa341ca15f4a70
parent 82ec48afd2674b8ef1e5a6645379d217078db5f7
author Bill Yi <byi@google.com> 1630269550 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630269550 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3280b6a035 -s ours am: 82ec48afd2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7c56a16f67f408b4b75bba1cec5960fe67476b95