tree df4e70a6963d8fb66955a66dd907fb05a823b3be
parent cae0fe2e63f94856d2c71de71b87f7ae94f7baa4
parent bc4dee4a63616529e65a5d90a3c339d31ffb331e
author Bill Yi <byi@google.com> 1647571623 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1647571623 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 24cc3cd739 -s ours am: bc4dee4a63 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I05d511edbc2e4cbecf9e17c2a906ca861cfc6068